diff -Nru mplayer-1.3.0/debian/changelog mplayer-1.3.0/debian/changelog --- mplayer-1.3.0/debian/changelog 2018-01-30 10:17:10.000000000 +0000 +++ mplayer-1.3.0/debian/changelog 2018-04-27 11:05:43.000000000 +0000 @@ -1,14 +1,27 @@ -mplayer (2:1.3.0-7build2) bionic; urgency=medium +mplayer (2:1.3.0-8) unstable; urgency=medium - * No-change rebuild for x264 soname change. + * Team upload. - -- Matthias Klose Tue, 30 Jan 2018 10:17:10 +0000 + [ Ondřej Nový ] + * d/copyright: Use https protocol in Format field. + * d/control: Set Vcs-* to salsa.debian.org. + * d/changelog: Remove trailing whitespaces. -mplayer (2:1.3.0-7build1) bionic; urgency=medium + [ Felipe Sateler ] + * Change maintainer address to debian-multimedia@lists.debian.org. - * No-change rebuild against libcdio17 + [ James Cowgill ] + * debian/patches: + - Fix patch header in 0100_svn37857_CVE-2016-4352.patch + - Add upstream patch to use pkg-config if freetype-config is unavailable. + (Closes: #892442) + - Add patch to fix FTBFS with glibc 2.27 on i386. (Closes: #896805) + - Backport upstream patches to fix FTBFS with FFmpeg 4.0. (Closes: #888378) + - Add patch to fallback to "generic" architecture of cpu detection fails. + (Closes: #728772) + * debian/watch: Use secure watch URL. - -- Steve Langasek Wed, 06 Dec 2017 02:52:19 +0000 + -- James Cowgill Fri, 27 Apr 2018 12:05:43 +0100 mplayer (2:1.3.0-7) unstable; urgency=medium @@ -383,7 +396,7 @@ mplayer (2:1.0~rc4~try1-1) experimental; urgency=low * New Upstream Version, LP: #539315 - * Build (against) again the System FFmpeg + * Build (against) again the System FFmpeg * tighten dependency on FFmpeg 0.6 * remove patches merged upstream * remove 22disable-xscreensaver.patch @@ -445,7 +458,7 @@ mplayer (2:1.0~rc3+svn20100502-4) unstable; urgency=low * copy in mencoder.c from upstream - * enable mplayer-gui (Closes: #579925) and mencoder packages. + * enable mplayer-gui (Closes: #579925) and mencoder packages. (Closes: #396954, #400940, #580168) -- Reinhard Tartler Wed, 26 May 2010 08:57:28 +0200 @@ -478,7 +491,7 @@ * new upstream snapshot from rc3 branch. * remove patches applied upstream: - + - 24_enable_fontconfig_by_default.diff - 30_add_gmplayer_man_rules.diff - 40_improve_desktop_file.patch @@ -498,7 +511,7 @@ * add md5sum to remove to avoid spurious conffile prompt, Closes: #568272 * Make mplayer build on kFreeBSD (backports from upstream), Closes: #578622 - Revert obscure hack that disables the malloc.h check on certain BSD - platforms. + platforms. - disable vidix on kFreeBSD-amd64 - rename 'struct keypad' -> 'struct m_keypad' to avoid FTBFS on kFreeBSD/amd64 @@ -507,7 +520,7 @@ mplayer (2:1.0~rc3+svn20090426-1ubuntu16) lucid; urgency=low - * move config file and apport hook 'mplayer-nogui'->'mplayer' + * move config file and apport hook 'mplayer-nogui'->'mplayer' LP: #540491, #549613 * improve mplayer version output * no longer build depend on libfaac, see LP #374900 for details @@ -575,7 +588,7 @@ -- Reinhard Tartler Thu, 15 Oct 2009 17:55:21 +0200 mplayer (2:1.0~rc3+svn20090426-1ubuntu9) karmic; urgency=low - + [ Julien Lavergne ] * Renable xvid support by removing --disable-xvid in debian/rules. @@ -626,7 +639,7 @@ mplayer (2:1.0~rc3+svn20090426-1ubuntu4) karmic; urgency=low - * remove 22disable-xscreensaver.patch. Patch is not working properly + * remove 22disable-xscreensaver.patch. Patch is not working properly anyways and actually potentially dangerous because it is faking input activity. * enable fontconfig by default. (Closes: #573257) @@ -698,7 +711,7 @@ - implement as quilt patch, submitted upstream - debian/rules: make use of the added rules * use dh_prep instead of dh_clean -k - * bump Standards-Version to 3.8.1 + * bump Standards-Version to 3.8.1 -- Reinhard Tartler Sun, 05 Apr 2009 11:37:37 +0200 @@ -735,7 +748,7 @@ mplayer (1.0~rc2+svn20090303-5) unstable; urgency=low - * debian/control : move docbook-xml,docbook-xsl,xsltproc from + * debian/control : move docbook-xml,docbook-xsl,xsltproc from Build-Depends-Indep to Build-Depends, since they are needed to run configure @@ -754,7 +767,7 @@ * try a fix for bug 520113 -- A Mennucc1 Fri, 20 Mar 2009 18:23:35 +0100 - + mplayer (1.0~rc2+svn20090303-2) unstable; urgency=low * always build documentation. Fixes FTBFS. @@ -803,7 +816,7 @@ mplayer/voutput, which needs more thought. (Closes: #445091) * verified that http://oumph.free.fr/tmp/29761.h264 no longer crashes mplayer (Closes: #497467) - * add japanese debconf translation, thanks to Hideki Yamane. + * add japanese debconf translation, thanks to Hideki Yamane. (Closes: #512874) * warn about libstdc++.so.5 when installing binary codecs in i386 as well (Closes: #497787) @@ -834,7 +847,7 @@ Steffen Joeris, Reimar Döffinger. (Closes: #500683). * Clean lintian warnings: build-depend on libgif-dev instead of libungif4-dev - build-depend on x11proto-core-dev instead of x-dev + build-depend on x11proto-core-dev instead of x-dev depends on debconf | debconf-2.0 * Up standard to 3.8.0.0 support DEB_BUILD_OPTIONS="parallel=n" @@ -849,7 +862,7 @@ thanks to Fernando Mitio Yamada (Closes: #483499). * fix: show correct length of theora video (from svn27354), thanks to Sam Morris and Reimar Döffinger (Closes: #464207). - * [INTL:sv] Swedish strings for mplayer debconf, + * [INTL:sv] Swedish strings for mplayer debconf, thanks to brother@bsnet.se (Closes: #491777). -- A Mennucc1 Sun, 27 Jul 2008 09:26:24 +0200 @@ -864,7 +877,7 @@ mplayer (1.0~rc2-15) unstable; urgency=low - * build-depend on liblzo2-dev + * build-depend on liblzo2-dev * Bug fix: "mplayer segfaults on opening any *.flv file", thanks A LOT to Ondrej Certik (Closes: #489291). * Bug fix: "mplayer: crashes on playing a standalone aac file", thanks @@ -892,7 +905,7 @@ * Conflicts on gcc-4.3 <= 4.3.0-3 to avoid bug 475153 . * Sorry, 'DEB_BUILD_OPTIONS=noopt ./debian/rules build-arch' is again broken in i386 . It is simply too difficult to build - mplayer on i386 w/o optimizing it a bit. For details, see + mplayer on i386 w/o optimizing it a bit. For details, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=402950#44 and following. * For this reason, and to help solving the strange bug 478731 @@ -957,7 +970,7 @@ * fix for CVE-2008-0486 Array index vulnerability in libmpdemux/demux_audio.c a.k.a. CORE-2008-0122: MPlayer arbitrary pointer dereference thanks Stefan Fritsch (closes: #464060) - + -- A Mennucc1 Fri, 8 Feb 2008 20:42:41 +0100 mplayer (1.0~rc2-7) unstable; urgency=low @@ -987,12 +1000,12 @@ * corrected mplayer.menu to section="Applications/Viewers" * fix: cant open a file with spaces in the name through nautilus, thanks to giggz (Closes: #449298) - * fix: 2xsai filter generates side-by-side double-height images on amd64, + * fix: 2xsai filter generates side-by-side double-height images on amd64, thanks to Josh Triplett and Reimar Döffinger (Closes: #450999) * clean up of 10configure-alpha.dpatch and 12configure-vidix-alpha.dpatch * Debconf templates and debian/control reviewed by the debian-l10n-english team as part of the Smith review project. - Thanks to Christian Perrier. + Thanks to Christian Perrier. Closes: #447111, #448247, #412394, #414510, #448247 [Debconf translation updates] * Belarusian. Thanks Andrei Darashenka. Closes: #447115, #447305 @@ -1048,7 +1061,7 @@ * New upstream version. * Remove RTC debconf question and /etc/init.d/mplayer (Closes: #421363) * Use dpatch. - + -- A Mennucc1 Wed, 18 Oct 2007 19:27:16 +0200 mplayer (1.0~rc1-16.1) unstable; urgency=high @@ -1093,7 +1106,7 @@ -- A Mennucc1 Wed, 6 Jun 2007 10:17:22 +0200 mplayer (1.0~rc1-13) unstable; urgency=low - + * fix for CVE-2007-1246 and similar (Closes: #414075) thanks Kees Cook & Moritz Jodeitand & R Togni patches for files @@ -1104,12 +1117,12 @@ * [INTL] Dutch po-debconf translation, thanks cobaco (Closes: #413880) * [INTL] Russian po-debconf translation, thanks Yuri Kozlov (Closes: #414251) * patch for ia64 unaligned access crash, - thanks to Bryan Stillwell for debugging & + thanks to Bryan Stillwell for debugging & Reimar Döffinger for the patch (Closes: #409431). * mplayer-doc: add doc-base documentation indexes, thanks to Martintxo (Closes: #405945). * binary_codecs.sh: check MD5 on downloaded stuff (Closes: #405371). - * binary_codecs.sh: check if bzip2 is there, and bail out + * binary_codecs.sh: check if bzip2 is there, and bail out graciously otherwise; if untarring fails, allow for retry. Fixes "binary_codecs.sh doesn't install already downloaded codecs", thanks to Ingo Bressler for problem analysis (Closes: #413063). @@ -1125,11 +1138,11 @@ * [INTL] fix small typo in English template, thanks cobaco (closes: #414393) * [INTL] devices.html -> video.html , thanks cobaco (closes: #414392) * [INTL] True Type -> TrueType , thanks cobaco (closes: #414394) - * [INTL] ~/.mplayer/mplayer.conf -> ~/.mplayer/config , + * [INTL] ~/.mplayer/mplayer.conf -> ~/.mplayer/config , thanks Jacobo Tarrio (closes: #408055) -- A Mennucc1 Sat, 10 Mar 2007 12:57:16 +0100 - + mplayer (1.0~rc1-12) unstable; urgency=medium * (possible) security fixes backported from SVN @@ -1143,14 +1156,14 @@ thanks to Linas Žvirblis (Closes: #406346). * clarify dependencies (do not pick up them randomly!), thanks to EspeonEefi (Closes: #405170); - debian/rules: when configuring, disable also: arts , jack , aa , dv , smb + debian/rules: when configuring, disable also: arts , jack , aa , dv , smb debian/control: depend on: lzo, speex, dts, ladspa, gl (mesa) * the above adds opengl video output (Closes: #400934). * forked processes cannot use GTK gui; this fixes bug in caching streams in gmplayer (Closes: #396962) thanks to martin f krafft and Reimar Döffinger for patch. * added in debian/patches all patches that I applied or I am working on - + -- A Mennucc1 Wed, 31 Jan 2007 10:30:24 +0100 mplayer (1.0~rc1-11) unstable; urgency=high @@ -1165,7 +1178,7 @@ mplayer (1.0~rc1-10) unstable; urgency=high * really apply patch for (Closes: #403379) - * many fixes to various codecs, to prevent crashes on + * many fixes to various codecs, to prevent crashes on randomly altered streams -- A Mennucc1 Mon, 18 Dec 2006 11:46:35 +0100 @@ -1180,7 +1193,7 @@ mplayer (1.0~rc1-8) unstable; urgency=low - * fix segfault on (broken) MPEGs without I frames, (Closes: #402922). + * fix segfault on (broken) MPEGs without I frames, (Closes: #402922). * README.Debian: document apt pinning and debian-multimedia * can be compiled with --enable-debug (Closes: #402920). * supports DEB_BUILD_OPTIONS=nostrip/noopt (Closes: #402950) @@ -1265,7 +1278,7 @@ * Use po-debconf [Diego suggested:] * Don't install codecs.conf. If people fiddle w/ it, playback *will* break. - * --disable-bitmap-font, so no more + * --disable-bitmap-font, so no more "annoying message on 'ttf doesn't look like a bitmap '", thanks to Michael Piefel (Closes: #395325) and Diego @@ -1284,7 +1297,7 @@ mplayer (1.0~rc1~svn20199-1) unstable; urgency=low - * code pulled from SVN + * code pulled from SVN (and some dirs deleted : see 'debian/rules fix-orig-source') * do not depend on xmms * build libraries with -fPIC @@ -1294,7 +1307,7 @@ mplayer (1.0~rc1~svn19921) unstable; urgency=low - * code pulled from SVN + * code pulled from SVN (and some dirs deleted : see 'debian/rules fix-orig-source') * better debian/copyright file * fixed some lintian issues @@ -1347,7 +1360,7 @@ inappropriate - Changed Build-Depends: so it works in pbuilder - Explicitly build-depend on libjpeg62-dev, libfontconfig1-dev, - libungif4-dev + libungif4-dev - Tweak debian/rules to avoid certain errors being ignored - Use --language=all @@ -1355,7 +1368,7 @@ mplayer (1.0pre6a-3) unstable; urgency=low - * provide a target 'debian/rules get-orig-source' + * provide a target 'debian/rules get-orig-source' that recreates the orig.tar.gz ; then use the above orig.tar.gz * rewrote some parts of debian/rules * don't clean and recompile docs if upstream ships them @@ -1387,7 +1400,7 @@ - an empty 'font=' in mplayer.conf breaks mplayer: postinst corrected * correction in 'mplayer/cfgnote' * better mplayer.postinst and mplayer.config - + -- A Mennucc1 Sun, 18 Apr 2004 17:25:37 +0200 mplayer (1.0.cvs20030324-1) unstable; urgency=low @@ -1396,17 +1409,17 @@ in debian-devel, I have prepared a new packaging of 'mplayer' (with code that comes from CVS) * the upstream tar.bz cannot be distributed by Debian, since it contains - CSS code; so I am repackaging it + CSS code; so I am repackaging it * I have tried my best to address all known issues: - - the package contains the detailed Copyright made by Diego Biurrun - - the package does not contain CSS code, or AFAIK other code on which + - the package contains the detailed Copyright made by Diego Biurrun + - the package does not contain CSS code, or AFAIK other code on which there is active patent enforcement - there is a script debian/cvs-changelog.sh that shows all changes done to files included in this source. This should comply with GPLv2 sec 2.a (in spirit if not in letter) For this reason, the source code contains CVS directories. * needs make (>= 3.80) for 'html-chunked-$(1)' in DOCS/xml/Makefile - + -- A Mennucc1 Wed, 30 Mar 2004 18:04:06 +0100 mplayer (0.90-3) unstable; urgency=low @@ -1420,15 +1433,15 @@ mplayer (0.90-2) unstable; urgency=low - * removed all CSS code. Now mplayer use lib dvdread + * removed all CSS code. Now mplayer use lib dvdread -- A Mennucc1 Fri, 25 Jul 2003 10:50:26 +0200 mplayer (0.90-1) unstable; urgency=low - * uploaded to Debian. The source code was scrutinized for + * uploaded to Debian. The source code was scrutinized for licenses and copyrights. Read copyright for a detailed discussion. - + -- A Mennucc1 Wed, 23 Jul 2003 09:45:41 +0200 mplayer (0.90) unstable; urgency=low @@ -1438,53 +1451,53 @@ -- Gabucino Sun, 16 Feb 2003 11:02:51 +0100 mplayer (0.90rc4-1) unstable; urgency=low - + * new rc-release - + -- A Mennucc1 Mon, 24 Feb 2003 18:40:13 +0100 - + mplayer (0.90rc3-2) unstable; urgency=low - + * configure: --disable-dvdnav --enable-mpdvdkit --disable-aa --disable-ggi on suggestions from author(s) - + -- A Mennucc1 Thu, 23 Jan 2003 14:12:50 +0100 - + mplayer (0.90rc3-1) unstable; urgency=low - + * show notes in config, not template * default device in Debian is usually /dev/cdrom, not /dev/dvd -- A Mennucc1 Mon, 20 Jan 2003 15:54:57 +0100 - + mplayer (0.90rc2-5) unstable; urgency=low - + * ftp-installer: Please read README.Debian.2 * other adjustments to debian/* * notes in the templates were not showing, due to a missing go(); - + -- A Mennucc1 Thu, 16 Jan 2003 10:02:43 +0100 - + mplayer (0.90rc2-4) unstable; urgency=low - + * #DEBHELPER# in postinst was not working OK (not passing arguments) * template mplayer/install_codecs was not showing - + -- Andrea Mennucc Tue, 14 Jan 2003 09:48:44 +0100 mplayer (0.90rc2-3) unstable; urgency=low - + * Thanks to Nagy for teaming up. His are mime and conffile and scripts. - + -- Andrea Mennucc Mon, 13 Jan 2003 16:46:22 +0100 - + mplayer (0.90rc2-2) unstable; urgency=low - + * pass control to debconf scripts in postinst and postrm * purge debconf database on purge. - + -- Dariush Pietrzak Sun, 12 Jan 2003 15:01:38 +0100 - + mplayer (0.90rc3-0) unstable; urgency=low * new release. @@ -1565,14 +1578,14 @@ mplayer (0.60-3) unstable; urgency=low - * install xvidix correctly + * install xvidix correctly -- Dariush Pietrzak Sun, 17 Mar 2002 16:38:54 +0100 mplayer (0.60-2) unstable; urgency=low * This is meaningless, just to mark that more then 2 months have passed - since last release and lots of thing in mplayer have changed. + since last release and lots of thing in mplayer have changed. -- Dariush Pietrzak Thu, 7 Mar 2002 00:34:20 +0100 @@ -1610,7 +1623,7 @@ mplayer (0.50-2) unstable; urgency=low - * gui added to package/menu + * gui added to package/menu -- Dariush Pietrzak Wed, 7 Nov 2001 11:31:46 +0100 @@ -1622,31 +1635,31 @@ mplayer (0.18-4) unstable; urgency=low - * Changes to debian packaging suggested Josip Rodin + * Changes to debian packaging suggested Josip Rodin -- Dariush Pietrzak Wed, 22 Aug 2001 22:40:58 +0200 mplayer (0.18-3) unstable; urgency=low - * fixed templates. + * fixed templates. -- Dariush Pietrzak Sat, 28 Jul 2001 09:45:45 +0200 mplayer (0.18-2) unstable; urgency=low - * modified debian scripts + * modified debian scripts -- Dariush Pietrzak Fri, 27 Jul 2001 09:25:52 +0200 mplayer (0.18-1) unstable; urgency=low - * lots of changes in mplayer + * lots of changes in mplayer -- Dariush Pietrzak Mon, 25 Jun 2001 15:59:18 +0200 mplayer (0.17a-2) unstable; urgency=low - * mplayer.conf file, automatic menu files update + * mplayer.conf file, automatic menu files update -- Dariush Pietrzak Sun, 20 May 2001 22:50:41 +0200 diff -Nru mplayer-1.3.0/debian/control mplayer-1.3.0/debian/control --- mplayer-1.3.0/debian/control 2017-12-06 02:52:19.000000000 +0000 +++ mplayer-1.3.0/debian/control 2018-04-25 15:15:58.000000000 +0000 @@ -1,15 +1,14 @@ Source: mplayer Section: video Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Multimedia Maintainers +Maintainer: Debian Multimedia Maintainers Uploaders: A Mennucc1 , Miguel A. Colón Vélez , Reinhard Tartler Standards-Version: 4.1.1 -Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/mplayer.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/mplayer.git +Vcs-Git: https://salsa.debian.org/multimedia-team/mplayer.git +Vcs-Browser: https://salsa.debian.org/multimedia-team/mplayer Homepage: https://www.mplayerhq.hu Build-Depends: debhelper (>= 10), diff -Nru mplayer-1.3.0/debian/copyright mplayer-1.3.0/debian/copyright --- mplayer-1.3.0/debian/copyright 2017-10-21 22:01:01.000000000 +0000 +++ mplayer-1.3.0/debian/copyright 2018-04-25 15:15:58.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: MPlayer Source: https://www.mplayerhq.hu Copyright: GPL-2+ diff -Nru mplayer-1.3.0/debian/patches/0100_svn37857_CVE-2016-4352.patch mplayer-1.3.0/debian/patches/0100_svn37857_CVE-2016-4352.patch --- mplayer-1.3.0/debian/patches/0100_svn37857_CVE-2016-4352.patch 2017-10-21 22:01:01.000000000 +0000 +++ mplayer-1.3.0/debian/patches/0100_svn37857_CVE-2016-4352.patch 2018-04-25 15:22:37.000000000 +0000 @@ -1,8 +1,8 @@ Description: Validate image size in demux_gif - -Fixes crash with -vo null and overflow.gif -Reported by Gustavo Grieco -Debian-Bug: https://bugs.debian.org/823723 + Fixes crash with -vo null and overflow.gif + Reported by Gustavo Grieco +Origin: upstream, commit:37857 +Bug-Debian: https://bugs.debian.org/823723 --- a/libmpdemux/demux_gif.c +++ b/libmpdemux/demux_gif.c diff -Nru mplayer-1.3.0/debian/patches/0103_svn38021_use-pkg-config-to-find-freetype.patch mplayer-1.3.0/debian/patches/0103_svn38021_use-pkg-config-to-find-freetype.patch --- mplayer-1.3.0/debian/patches/0103_svn38021_use-pkg-config-to-find-freetype.patch 1970-01-01 00:00:00.000000000 +0000 +++ mplayer-1.3.0/debian/patches/0103_svn38021_use-pkg-config-to-find-freetype.patch 2018-04-25 15:28:13.000000000 +0000 @@ -0,0 +1,24 @@ +Description: configure: Use pkg-config if freetype-config is unavailable + Currently we only try to use freetype-config, but freetype-config + is deprecated by upstream. Starting soon freetype-config will + not be installed by typical freetype builds anymore. + . + Use pkg-config if freetype-config is not available. This + is identical to how we treat dvdnav-config and dvdread-config. +Origin: upstream, commit:38021 +Bug-Debian: https://bugs.debian.org/892442 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/configure ++++ b/configure +@@ -841,7 +841,8 @@ quicktime=auto + _macosx_finder=no + _macosx_bundle=auto + _sortsub=yes +-_freetypeconfig='freetype-config' ++_freetypeconfig='pkg-config freetype2' ++type freetype-config >/dev/null 2>&1 && _freetypeconfig=freetype-config + _fribidi=auto + _enca=auto + _inet6=auto diff -Nru mplayer-1.3.0/debian/patches/0104_ffmpeg-4.0.patch mplayer-1.3.0/debian/patches/0104_ffmpeg-4.0.patch --- mplayer-1.3.0/debian/patches/0104_ffmpeg-4.0.patch 1970-01-01 00:00:00.000000000 +0000 +++ mplayer-1.3.0/debian/patches/0104_ffmpeg-4.0.patch 2018-04-26 14:27:04.000000000 +0000 @@ -0,0 +1,606 @@ +Description: Fix FTBFS with FFmpeg 4.0 + This patch is a combination of the below upstream commits, backported to + 1.3.0. + . + Some parts which are only relevant to static FFmpeg have been removed because + they don't need patching in Debian. + - Disabling of vf_mcdeint.c +Origin: backport, commit:37998 +Origin: backport, commit:37999 +Origin: backport, commit:38001 +Bug-Debian: https://bugs.debian.org/888378 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/libmpdemux/demuxer.c ++++ b/libmpdemux/demuxer.c +@@ -50,7 +50,7 @@ + + #ifdef CONFIG_FFMPEG + #include "libavcodec/avcodec.h" +-#if MP_INPUT_BUFFER_PADDING_SIZE < FF_INPUT_BUFFER_PADDING_SIZE ++#if MP_INPUT_BUFFER_PADDING_SIZE < AV_INPUT_BUFFER_PADDING_SIZE + #error MP_INPUT_BUFFER_PADDING_SIZE is too small! + #endif + #include "av_helpers.h" +--- a/libmpdemux/demux_lavf.c ++++ b/libmpdemux/demux_lavf.c +@@ -176,7 +176,7 @@ static int lavf_check_file(demuxer_t *de + } + + avpd.buf = av_mallocz(FFMAX(BIO_BUFFER_SIZE, PROBE_BUF_SIZE) + +- FF_INPUT_BUFFER_PADDING_SIZE); ++ AV_INPUT_BUFFER_PADDING_SIZE); + do { + read_size = stream_read(demuxer->stream, avpd.buf + probe_data_size, read_size); + if(read_size < 0) { +--- a/libmpcodecs/ad_ffmpeg.c ++++ b/libmpcodecs/ad_ffmpeg.c +@@ -134,7 +134,7 @@ static int init(sh_audio_t *sh_audio) + + /* alloc extra data */ + if (sh_audio->wf && sh_audio->wf->cbSize > 0) { +- lavc_context->extradata = av_mallocz(sh_audio->wf->cbSize + FF_INPUT_BUFFER_PADDING_SIZE); ++ lavc_context->extradata = av_mallocz(sh_audio->wf->cbSize + AV_INPUT_BUFFER_PADDING_SIZE); + lavc_context->extradata_size = sh_audio->wf->cbSize; + memcpy(lavc_context->extradata, sh_audio->wf + 1, + lavc_context->extradata_size); +--- a/libmpcodecs/vf_uspp.c ++++ b/libmpcodecs/vf_uspp.c +@@ -240,7 +240,7 @@ static int config(struct vf_instance *vf + avctx_enc->gop_size = 300; + avctx_enc->max_b_frames= 0; + avctx_enc->pix_fmt = AV_PIX_FMT_YUV420P; +- avctx_enc->flags = CODEC_FLAG_QSCALE | CODEC_FLAG_LOW_DELAY; ++ avctx_enc->flags = AV_CODEC_FLAG_QSCALE | AV_CODEC_FLAG_LOW_DELAY; + avctx_enc->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL; + avctx_enc->global_quality= 123; + av_dict_set(&opts, "no_bitstream", "1", 0); +--- a/libmpcodecs/vf_lavc.c ++++ b/libmpcodecs/vf_lavc.c +@@ -157,7 +157,7 @@ static int vf_open(vf_instance_t *vf, ch + + if(p_quality<32){ + // fixed qscale +- lavc_venc_context.flags = CODEC_FLAG_QSCALE; ++ lavc_venc_context.flags = AV_CODEC_FLAG_QSCALE; + lavc_venc_context.global_quality = + vf->priv->pic->quality = (int)(FF_QP2LAMBDA * ((p_quality<1) ? 1 : p_quality) + 0.5); + } else { +--- a/libmpcodecs/ae_lavc.c ++++ b/libmpcodecs/ae_lavc.c +@@ -224,10 +224,10 @@ int mpae_init_lavc(audio_encoder_t *enco + } + if((lavc_param_audio_global_header&1) + /*|| (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))*/){ +- lavc_actx->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ lavc_actx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + } + if(lavc_param_audio_global_header&2){ +- lavc_actx->flags2 |= CODEC_FLAG2_LOCAL_HEADER; ++ lavc_actx->flags2 |= AV_CODEC_FLAG2_LOCAL_HEADER; + } + + if(avcodec_open2(lavc_actx, lavc_acodec, NULL) < 0) +--- a/libmpcodecs/vd_ffmpeg.c ++++ b/libmpcodecs/vd_ffmpeg.c +@@ -115,8 +115,7 @@ static int lavc_param_gray=0; + static int lavc_param_vstats=0; + static int lavc_param_idct_algo=0; + static int lavc_param_debug=0; +-static int lavc_param_vismv=0; +-#ifdef CODEC_FLAG2_SHOW_ALL ++#ifdef AV_CODEC_FLAG2_SHOW_ALL + static int lavc_param_wait_keyframe=0; + #endif + static int lavc_param_skip_top=0; +@@ -141,24 +140,23 @@ static const mp_image_t mpi_no_picture = + const m_option_t lavc_decode_opts_conf[]={ + {"bug" , &lavc_param_workaround_bugs , CONF_TYPE_INT , CONF_RANGE, -1, 999999, NULL}, + {"er" , &lavc_param_error_resilience , CONF_TYPE_INT , CONF_RANGE, 0, 99, NULL}, +- {"gray" , &lavc_param_gray , CONF_TYPE_FLAG , 0, 0, CODEC_FLAG_GRAY, NULL}, ++ {"gray" , &lavc_param_gray , CONF_TYPE_FLAG , 0, 0, AV_CODEC_FLAG_GRAY, NULL}, + {"idct" , &lavc_param_idct_algo , CONF_TYPE_INT , CONF_RANGE, 0, 99, NULL}, + {"ec" , &lavc_param_error_concealment , CONF_TYPE_INT , CONF_RANGE, 0, 99, NULL}, + {"vstats" , &lavc_param_vstats , CONF_TYPE_FLAG , 0, 0, 1, NULL}, + {"debug" , &lavc_param_debug , CONF_TYPE_INT , CONF_RANGE, 0, 9999999, NULL}, +- {"vismv" , &lavc_param_vismv , CONF_TYPE_INT , CONF_RANGE, 0, 9999999, NULL}, +-#ifdef CODEC_FLAG2_SHOW_ALL ++#ifdef AV_CODEC_FLAG2_SHOW_ALL + {"wait_keyframe" , &lavc_param_wait_keyframe , CONF_TYPE_FLAG , 0, 0, 1, NULL}, + #endif + {"st" , &lavc_param_skip_top , CONF_TYPE_INT , CONF_RANGE, 0, 999, NULL}, + {"sb" , &lavc_param_skip_bottom , CONF_TYPE_INT , CONF_RANGE, 0, 999, NULL}, +- {"fast" , &lavc_param_fast , CONF_TYPE_FLAG , 0, 0, CODEC_FLAG2_FAST, NULL}, ++ {"fast" , &lavc_param_fast , CONF_TYPE_FLAG , 0, 0, AV_CODEC_FLAG2_FAST, NULL}, + {"lowres" , &lavc_param_lowres_str , CONF_TYPE_STRING , 0, 0, 0, NULL}, + {"skiploopfilter", &lavc_param_skip_loop_filter_str , CONF_TYPE_STRING , 0, 0, 0, NULL}, + {"skipidct" , &lavc_param_skip_idct_str , CONF_TYPE_STRING , 0, 0, 0, NULL}, + {"skipframe" , &lavc_param_skip_frame_str , CONF_TYPE_STRING , 0, 0, 0, NULL}, + {"threads" , &lavc_param_threads , CONF_TYPE_INT , CONF_RANGE, 1, 16, NULL}, +- {"bitexact" , &lavc_param_bitexact , CONF_TYPE_FLAG , 0, 0, CODEC_FLAG_BITEXACT, NULL}, ++ {"bitexact" , &lavc_param_bitexact , CONF_TYPE_FLAG , 0, 0, AV_CODEC_FLAG_BITEXACT, NULL}, + {"o" , &lavc_avopt , CONF_TYPE_STRING , 0, 0, 0, NULL}, + {NULL, NULL, 0, 0, 0, 0, NULL} + }; +@@ -196,7 +194,7 @@ static int control(sh_video_t *sh, int c + #if CONFIG_XVMC + case IMGFMT_XVMC_IDCT_MPEG2: + case IMGFMT_XVMC_MOCO_MPEG2: +- if(avctx->pix_fmt == AV_PIX_FMT_XVMC_MPEG2_IDCT) return CONTROL_TRUE; ++ if(avctx->pix_fmt == AV_PIX_FMT_XVMC) return CONTROL_TRUE; + #endif + } + return CONTROL_FALSE; +@@ -257,9 +255,9 @@ static void set_dr_slice_settings(struct + // explicitly requested + int use_slices = vd_use_slices > 0 || (vd_use_slices < 0 && lavc_param_threads <= 1); + +- ctx->do_slices = use_slices && (lavc_codec->capabilities & CODEC_CAP_DRAW_HORIZ_BAND); ++ ctx->do_slices = use_slices && (lavc_codec->capabilities & AV_CODEC_CAP_DRAW_HORIZ_BAND); + +- ctx->do_dr1 = (lavc_codec->capabilities & CODEC_CAP_DR1) && ++ ctx->do_dr1 = (lavc_codec->capabilities & AV_CODEC_CAP_DR1) && + lavc_codec->id != AV_CODEC_ID_INTERPLAY_VIDEO && + lavc_codec->id != AV_CODEC_ID_H264 && + lavc_codec->id != AV_CODEC_ID_HEVC; +@@ -271,12 +269,9 @@ static void set_dr_slice_settings(struct + ctx->do_dr1 = 1; + ctx->nonref_dr = 1; + } +- if (lavc_param_vismv || (lavc_param_debug & (FF_DEBUG_VIS_MB_TYPE|FF_DEBUG_VIS_QP))) { +- ctx->do_slices = ctx->do_dr1 = 0; +- } + if(ctx->do_dr1){ + avctx->get_buffer2 = get_buffer2; +- } else if (lavc_codec->capabilities & CODEC_CAP_DR1) { ++ } else if (lavc_codec->capabilities & AV_CODEC_CAP_DR1) { + avctx->get_buffer2 = avcodec_default_get_buffer2; + } + avctx->slice_flags = 0; +@@ -372,9 +367,9 @@ static int init(sh_video_t *sh){ + case 1: + avctx->err_recognition |= AV_EF_CAREFUL; + } +- lavc_param_gray|= CODEC_FLAG_GRAY; +-#ifdef CODEC_FLAG2_SHOW_ALL +- if(!lavc_param_wait_keyframe) avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; ++ lavc_param_gray|= AV_CODEC_FLAG_GRAY; ++#ifdef AV_CODEC_FLAG2_SHOW_ALL ++ if(!lavc_param_wait_keyframe) avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; + #endif + avctx->flags2|= lavc_param_fast; + avctx->codec_tag= sh->format; +@@ -383,7 +378,6 @@ static int init(sh_video_t *sh){ + avctx->debug= lavc_param_debug; + if (lavc_param_debug) + av_log_set_level(AV_LOG_DEBUG); +- avctx->debug_mv= lavc_param_vismv; + avctx->skip_top = lavc_param_skip_top; + avctx->skip_bottom= lavc_param_skip_bottom; + if(lavc_param_lowres_str != NULL) +@@ -419,7 +413,7 @@ static int init(sh_video_t *sh){ + handled here; the second case falls through to the next section. */ + if (sh->ImageDesc) { + avctx->extradata_size = (*(int *)sh->ImageDesc) - sizeof(int); +- avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); ++ avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + memcpy(avctx->extradata, ((int *)sh->ImageDesc)+1, avctx->extradata_size); + break; + } +@@ -434,7 +428,7 @@ static int init(sh_video_t *sh){ + break; + av_dict_set(&opts, "extern_huff", "1", 0); + avctx->extradata_size = sh->bih->biSize-sizeof(*sh->bih); +- avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); ++ avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size); + + #if 0 +@@ -457,14 +451,14 @@ static int init(sh_video_t *sh){ + if(sh->bih->biSizebih)+8){ + /* only 1 packet per frame & sub_id from fourcc */ + avctx->extradata_size= 8; +- avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); ++ avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + ((uint32_t *)avctx->extradata)[0] = 0; + ((uint32_t *)avctx->extradata)[1] = + (sh->format == mmioFOURCC('R', 'V', '1', '3')) ? 0x10003001 : 0x10000000; + } else { + /* has extra slice header (demux_rm or rm->avi streamcopy) */ + avctx->extradata_size = sh->bih->biSize-sizeof(*sh->bih); +- avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); ++ avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size); + } + +@@ -475,7 +469,7 @@ static int init(sh_video_t *sh){ + if (!sh->bih || sh->bih->biSize <= sizeof(*sh->bih)) + break; + avctx->extradata_size = sh->bih->biSize-sizeof(*sh->bih); +- avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); ++ avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size); + break; + } +--- a/libmpcodecs/ve_lavc.c ++++ b/libmpcodecs/ve_lavc.c +@@ -63,12 +63,9 @@ static int lavc_param_vbitrate = -1; + static int lavc_param_vrate_tolerance = 1000*8; + static int lavc_param_mb_decision = 0; /* default is realtime encoding */ + static int lavc_param_v4mv = 0; +-static int lavc_param_vme = 4; + static float lavc_param_vqscale = -1; + static int lavc_param_vqmin = 2; + static int lavc_param_vqmax = 31; +-static float lavc_param_lmin = 2; +-static float lavc_param_lmax = 31; + static float lavc_param_mb_lmin = 2; + static float lavc_param_mb_lmax = 31; + static int lavc_param_vqdiff = 3; +@@ -81,22 +78,15 @@ static float lavc_param_vi_qoffset = 0.0 + static int lavc_param_vmax_b_frames = 0; + static int lavc_param_keyint = -1; + static int lavc_param_vpass = 0; +-static int lavc_param_vrc_strategy = 0; + static int lavc_param_vb_strategy = 0; + static int lavc_param_packet_size= 0; + static int lavc_param_strict= -1; + static int lavc_param_data_partitioning= 0; + static int lavc_param_gray=0; +-static float lavc_param_rc_qsquish=1.0; +-static float lavc_param_rc_qmod_amp=0; +-static int lavc_param_rc_qmod_freq=0; + static char *lavc_param_rc_override_string=NULL; +-static char *lavc_param_rc_eq="tex^qComp"; + static int lavc_param_rc_buffer_size=0; +-static float lavc_param_rc_buffer_aggressivity=1.0; + static int lavc_param_rc_max_rate=0; + static int lavc_param_rc_min_rate=0; +-static float lavc_param_rc_initial_cplx=0; + static float lavc_param_rc_initial_buffer_occupancy=0.9; + static int lavc_param_mpeg_quant=0; + static int lavc_param_fdct=0; +@@ -108,8 +98,6 @@ static float lavc_param_dark_masking= 0. + static float lavc_param_temporal_cplx_masking= 0.0; + static float lavc_param_spatial_cplx_masking= 0.0; + static float lavc_param_p_masking= 0.0; +-static float lavc_param_border_masking= 0.0; +-static int lavc_param_normalize_aqp= 0; + static int lavc_param_interlaced_dct= 0; + static int lavc_param_prediction_method= FF_PRED_LEFT; + static int lavc_param_format= IMGFMT_YV12; +@@ -131,15 +119,12 @@ static int lavc_param_bit_exact = 0; + static int lavc_param_aic= 0; + static int lavc_param_aiv= 0; + static int lavc_param_umv= 0; +-static int lavc_param_gmc= 0; + static int lavc_param_obmc= 0; + static int lavc_param_loop= 0; + static int lavc_param_last_pred= 0; + static int lavc_param_pre_me= 1; + static int lavc_param_me_subpel_quality= 8; + static int lavc_param_me_range= 0; +-static int lavc_param_ibias= FF_DEFAULT_QUANT_BIAS; +-static int lavc_param_pbias= FF_DEFAULT_QUANT_BIAS; + static int lavc_param_coder= 0; + static int lavc_param_context= 0; + static char *lavc_param_intra_matrix = NULL; +@@ -162,7 +147,6 @@ static int lavc_param_skip_exp=0; + static int lavc_param_skip_cmp=0; + static int lavc_param_brd_scale = 0; + static int lavc_param_bidir_refine = 0; +-static int lavc_param_sc_factor = 1; + static int lavc_param_video_global_header= 0; + static int lavc_param_mv0_threshold = 256; + static int lavc_param_refs = 1; +@@ -190,21 +174,21 @@ const m_option_t lavcopts_conf[]={ + {"vhq", &lavc_param_mb_decision, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"mbd", &lavc_param_mb_decision, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL}, + {"v4mv", &lavc_param_v4mv, CONF_TYPE_FLAG, 0, 0, 1, NULL}, +- {"vme", &lavc_param_vme, CONF_TYPE_INT, CONF_RANGE, 0, 8, NULL}, ++ {"vme", "vme has no effect, please use the corresponding codec specific option (see FFmpeg documentation) instead of vme.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"vqscale", &lavc_param_vqscale, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 255.0, NULL}, + {"vqmin", &lavc_param_vqmin, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, + {"vqmax", &lavc_param_vqmax, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, +- {"lmin", &lavc_param_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, +- {"lmax", &lavc_param_lmax, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, ++ {"lmin", "Please use o=lmin=*QP2LAMBDA instead of lmin.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, ++ {"lmax", "Please use o=lmax=*QP2LAMBDA instead of lmax.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"mblmin", &lavc_param_mb_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, + {"mblmax", &lavc_param_mb_lmax, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, + {"vqdiff", &lavc_param_vqdiff, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, + {"vqcomp", &lavc_param_vqcompress, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, + {"vqblur", &lavc_param_vqblur, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, + {"vb_qfactor", &lavc_param_vb_qfactor, CONF_TYPE_FLOAT, CONF_RANGE, -31.0, 31.0, NULL}, +- {"vmax_b_frames", &lavc_param_vmax_b_frames, CONF_TYPE_INT, CONF_RANGE, 0, FF_MAX_B_FRAMES, NULL}, ++ {"vmax_b_frames", &lavc_param_vmax_b_frames, CONF_TYPE_INT, CONF_RANGE, 0, 16, NULL}, // FF_MAX_B_FRAMES was removed from FFmpeg. We still use its value here, so we probably limit ourselves in some cases. + {"vpass", &lavc_param_vpass, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL}, +- {"vrc_strategy", &lavc_param_vrc_strategy, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL}, ++ {"vrc_strategy", "Please use o=rc_strategy= instead of vrc_strategy.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"vb_strategy", &lavc_param_vb_strategy, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, + {"vb_qoffset", &lavc_param_vb_qoffset, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 31.0, NULL}, + {"vlelim", "Please use o=luma_elim_threshold= instead of vlelim.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, +@@ -213,20 +197,20 @@ const m_option_t lavcopts_conf[]={ + {"vstrict", &lavc_param_strict, CONF_TYPE_INT, CONF_RANGE, -99, 99, NULL}, + {"vdpart", &lavc_param_data_partitioning, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"keyint", &lavc_param_keyint, CONF_TYPE_INT, 0, 0, 0, NULL}, +- {"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY, NULL}, ++ {"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY, NULL}, + {"mpeg_quant", &lavc_param_mpeg_quant, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"vi_qfactor", &lavc_param_vi_qfactor, CONF_TYPE_FLOAT, CONF_RANGE, -31.0, 31.0, NULL}, + {"vi_qoffset", &lavc_param_vi_qoffset, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 31.0, NULL}, +- {"vqsquish", &lavc_param_rc_qsquish, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL}, +- {"vqmod_amp", &lavc_param_rc_qmod_amp, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL}, +- {"vqmod_freq", &lavc_param_rc_qmod_freq, CONF_TYPE_INT, 0, 0, 0, NULL}, +- {"vrc_eq", &lavc_param_rc_eq, CONF_TYPE_STRING, 0, 0, 0, NULL}, ++ {"vqsquish", "Please use o=qsquish= instead of vqsquish.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, ++ {"vqmod_amp", "Please use o=rc_qmod_amp= instead of vqmod_amp.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, ++ {"vqmod_freq", "Please use o=rc_qmod_freq= instead of vqmod_freq.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, ++ {"vrc_eq", "Please use o=rc_eq= instead of vrc_eq.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"vrc_override", &lavc_param_rc_override_string, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"vrc_maxrate", &lavc_param_rc_max_rate, CONF_TYPE_INT, CONF_RANGE, 0, MAX_BITRATE, NULL}, + {"vrc_minrate", &lavc_param_rc_min_rate, CONF_TYPE_INT, CONF_RANGE, 0, MAX_BITRATE, NULL}, + {"vrc_buf_size", &lavc_param_rc_buffer_size, CONF_TYPE_INT, CONF_RANGE, 4, MAX_BITRATE, NULL}, +- {"vrc_buf_aggressivity", &lavc_param_rc_buffer_aggressivity, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL}, +- {"vrc_init_cplx", &lavc_param_rc_initial_cplx, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 9999999.0, NULL}, ++ {"vrc_buf_aggressivity", "Please use o=rc_buf_aggressivity= instead of vrc_buf_aggressivity.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, ++ {"vrc_init_cplx", "Please use o=rc_init_cplx= instead of vrc_init_cplx.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"vrc_init_occupancy", &lavc_param_rc_initial_buffer_occupancy, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, + {"vfdct", &lavc_param_fdct, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, + {"aspect", &lavc_param_aspect, CONF_TYPE_STRING, 0, 0, 0, NULL}, +@@ -235,14 +219,14 @@ const m_option_t lavcopts_conf[]={ + {"tcplx_mask", &lavc_param_temporal_cplx_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL}, + {"scplx_mask", &lavc_param_spatial_cplx_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL}, + {"p_mask", &lavc_param_p_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL}, +- {"naq", &lavc_param_normalize_aqp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, ++ {"naq", "Please use o=mpv_flags=+naq instead of naq.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"dark_mask", &lavc_param_dark_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL}, + {"ildct", &lavc_param_interlaced_dct, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"idct", &lavc_param_idct, CONF_TYPE_INT, CONF_RANGE, 0, 20, NULL}, + {"pred", &lavc_param_prediction_method, CONF_TYPE_INT, CONF_RANGE, 0, 20, NULL}, + {"format", &lavc_param_format, CONF_TYPE_IMGFMT, 0, 0, 0, NULL}, + {"debug", &lavc_param_debug, CONF_TYPE_INT, CONF_RANGE, 0, 100000000, NULL}, +- {"psnr", &lavc_param_psnr, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR, NULL}, ++ {"psnr", &lavc_param_psnr, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR, NULL}, + {"precmp", &lavc_param_me_pre_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL}, + {"cmp", &lavc_param_me_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL}, + {"subcmp", &lavc_param_me_sub_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL}, +@@ -251,23 +235,23 @@ const m_option_t lavcopts_conf[]={ + #ifdef FF_CMP_VSAD + {"ildctcmp", &lavc_param_ildct_cmp, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL}, + #endif +- {"bit_exact", &lavc_param_bit_exact, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_BITEXACT, NULL}, ++ {"bit_exact", &lavc_param_bit_exact, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_BITEXACT, NULL}, + {"predia", &lavc_param_pre_dia_size, CONF_TYPE_INT, CONF_RANGE, -2000, 2000, NULL}, + {"dia", &lavc_param_dia_size, CONF_TYPE_INT, CONF_RANGE, -2000, 2000, NULL}, +- {"qpel", &lavc_param_qpel, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL, NULL}, ++ {"qpel", &lavc_param_qpel, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL, NULL}, + {"trell", &lavc_param_trell, CONF_TYPE_FLAG, 0, 0, 1, NULL}, +- {"lowdelay", &lavc_param_lowdelay, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_LOW_DELAY, NULL}, ++ {"lowdelay", &lavc_param_lowdelay, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_LOW_DELAY, NULL}, + {"last_pred", &lavc_param_last_pred, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL}, + {"preme", &lavc_param_pre_me, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL}, + {"subq", &lavc_param_me_subpel_quality, CONF_TYPE_INT, CONF_RANGE, 0, 8, NULL}, + {"me_range", &lavc_param_me_range, CONF_TYPE_INT, CONF_RANGE, 0, 16000, NULL}, +- {"aic", &lavc_param_aic, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED, NULL}, ++ {"aic", &lavc_param_aic, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED, NULL}, + {"umv", &lavc_param_umv, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"aiv", &lavc_param_aiv, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"obmc", &lavc_param_obmc, CONF_TYPE_FLAG, 0, 0, 1, NULL}, +- {"loop", &lavc_param_loop, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_LOOP_FILTER, NULL}, +- {"ibias", &lavc_param_ibias, CONF_TYPE_INT, CONF_RANGE, -512, 512, NULL}, +- {"pbias", &lavc_param_pbias, CONF_TYPE_INT, CONF_RANGE, -512, 512, NULL}, ++ {"loop", &lavc_param_loop, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_LOOP_FILTER, NULL}, ++ {"ibias", "Please use o=ibias= instead of ibias.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, ++ {"pbias", "Please use o=pbias= instead of pbias.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"coder", &lavc_param_coder, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, + {"context", &lavc_param_context, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, + {"intra_matrix", &lavc_param_intra_matrix, CONF_TYPE_STRING, 0, 0, 0, NULL}, +@@ -278,11 +262,11 @@ const m_option_t lavcopts_conf[]={ + {"qprd", "Please use o=mpv_flags=+qp_rd instead of qprd.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"ss", &lavc_param_ss, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"alt", &lavc_param_alt, CONF_TYPE_FLAG, 0, 0, 1, NULL}, +- {"ilme", &lavc_param_ilme, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME, NULL}, +- {"cgop", &lavc_param_closed_gop, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP, NULL}, +- {"gmc", &lavc_param_gmc, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC, NULL}, ++ {"ilme", &lavc_param_ilme, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME, NULL}, ++ {"cgop", &lavc_param_closed_gop, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP, NULL}, ++ {"gmc", "Please use o=gmc= instead of gmc.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"dc", &lavc_param_dc_precision, CONF_TYPE_INT, CONF_RANGE, 8, 11, NULL}, +- {"border_mask", &lavc_param_border_masking, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, ++ {"border_mask", "Please use o=border_mask= instead of border_mask.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"inter_threshold", "inter_threshold has no effect, please remove it.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"sc_threshold", &lavc_param_sc_threshold, CONF_TYPE_INT, CONF_RANGE, -1000000000, 1000000000, NULL}, + {"top", &lavc_param_top, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL}, +@@ -295,7 +279,7 @@ const m_option_t lavcopts_conf[]={ + {"skip_exp", &lavc_param_skip_exp, CONF_TYPE_INT, CONF_RANGE, 0, 1000000, NULL}, + {"brd_scale", &lavc_param_brd_scale, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, + {"bidir_refine", &lavc_param_bidir_refine, CONF_TYPE_INT, CONF_RANGE, 0, 4, NULL}, +- {"sc_factor", &lavc_param_sc_factor, CONF_TYPE_INT, CONF_RANGE, 1, INT_MAX, NULL}, ++ {"sc_factor", "sc_factor has no effect, please remove it.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"vglobal", &lavc_param_video_global_header, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, + {"aglobal", &lavc_param_audio_global_header, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, + {"mv0_threshold", &lavc_param_mv0_threshold, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, +@@ -351,8 +335,6 @@ static int config(struct vf_instance *vf + lavc_venc_context->time_base= (AVRational){mux_v->h.dwScale, mux_v->h.dwRate}; + lavc_venc_context->qmin= lavc_param_vqmin; + lavc_venc_context->qmax= lavc_param_vqmax; +- lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5); +- lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5); + lavc_venc_context->mb_lmin= (int)(FF_QP2LAMBDA * lavc_param_mb_lmin + 0.5); + lavc_venc_context->mb_lmax= (int)(FF_QP2LAMBDA * lavc_param_mb_lmax + 0.5); + lavc_venc_context->max_qdiff= lavc_param_vqdiff; +@@ -360,17 +342,12 @@ static int config(struct vf_instance *vf + lavc_venc_context->qblur= lavc_param_vqblur; + lavc_venc_context->max_b_frames= lavc_param_vmax_b_frames; + lavc_venc_context->b_quant_factor= lavc_param_vb_qfactor; +- lavc_venc_context->rc_strategy= lavc_param_vrc_strategy; + lavc_venc_context->b_frame_strategy= lavc_param_vb_strategy; + lavc_venc_context->b_quant_offset= (int)(FF_QP2LAMBDA * lavc_param_vb_qoffset + 0.5); + lavc_venc_context->rtp_payload_size= lavc_param_packet_size; + lavc_venc_context->strict_std_compliance= lavc_param_strict; + lavc_venc_context->i_quant_factor= lavc_param_vi_qfactor; + lavc_venc_context->i_quant_offset= (int)(FF_QP2LAMBDA * lavc_param_vi_qoffset + 0.5); +- lavc_venc_context->rc_qsquish= lavc_param_rc_qsquish; +- lavc_venc_context->rc_qmod_amp= lavc_param_rc_qmod_amp; +- lavc_venc_context->rc_qmod_freq= lavc_param_rc_qmod_freq; +- lavc_venc_context->rc_eq= lavc_param_rc_eq; + + mux_v->max_rate= + lavc_venc_context->rc_max_rate= lavc_param_rc_max_rate*1000; +@@ -382,8 +359,6 @@ static int config(struct vf_instance *vf + lavc_venc_context->rc_initial_buffer_occupancy= + lavc_venc_context->rc_buffer_size * + lavc_param_rc_initial_buffer_occupancy; +- lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity; +- lavc_venc_context->rc_initial_cplx= lavc_param_rc_initial_cplx; + lavc_venc_context->debug= lavc_param_debug; + lavc_venc_context->last_predictor_count= lavc_param_last_pred; + lavc_venc_context->pre_me= lavc_param_pre_me; +@@ -391,8 +366,6 @@ static int config(struct vf_instance *vf + lavc_venc_context->pre_dia_size= lavc_param_pre_dia_size; + lavc_venc_context->me_subpel_quality= lavc_param_me_subpel_quality; + lavc_venc_context->me_range= lavc_param_me_range; +- lavc_venc_context->intra_quant_bias= lavc_param_ibias; +- lavc_venc_context->inter_quant_bias= lavc_param_pbias; + lavc_venc_context->coder_type= lavc_param_coder; + lavc_venc_context->context_model= lavc_param_context; + lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold; +@@ -479,7 +452,6 @@ static int config(struct vf_instance *vf + lavc_venc_context->spatial_cplx_masking= lavc_param_spatial_cplx_masking; + lavc_venc_context->p_masking= lavc_param_p_masking; + lavc_venc_context->dark_masking= lavc_param_dark_masking; +- lavc_venc_context->border_masking = lavc_param_border_masking; + + if (lavc_param_aspect != NULL) + { +@@ -543,7 +515,7 @@ static int config(struct vf_instance *vf + if (lavc_param_obmc) + av_dict_set(&opts, "obmc", "1", 0); + lavc_venc_context->flags|= lavc_param_loop; +- lavc_venc_context->flags|= lavc_param_v4mv ? CODEC_FLAG_4MV : 0; ++ lavc_venc_context->flags|= lavc_param_v4mv ? AV_CODEC_FLAG_4MV : 0; + if (lavc_param_data_partitioning) + av_dict_set(&opts, "data_partitioning", "1", 0); + lavc_venc_context->flags|= lavc_param_mv0; +@@ -552,26 +524,23 @@ static int config(struct vf_instance *vf + if (lavc_param_alt) + av_dict_set(&opts, "alternate_scan", "1", 0); + lavc_venc_context->flags|= lavc_param_ilme; +- lavc_venc_context->flags|= lavc_param_gmc; +-#ifdef CODEC_FLAG_CLOSED_GOP ++#ifdef AV_CODEC_FLAG_CLOSED_GOP + lavc_venc_context->flags|= lavc_param_closed_gop; + #endif + lavc_venc_context->flags|= lavc_param_gray; + +- if(lavc_param_normalize_aqp) lavc_venc_context->flags|= CODEC_FLAG_NORMALIZE_AQP; +- if(lavc_param_interlaced_dct) lavc_venc_context->flags|= CODEC_FLAG_INTERLACED_DCT; ++ if(lavc_param_interlaced_dct) lavc_venc_context->flags|= AV_CODEC_FLAG_INTERLACED_DCT; + lavc_venc_context->flags|= lavc_param_psnr; + lavc_venc_context->intra_dc_precision = lavc_param_dc_precision - 8; + lavc_venc_context->prediction_method= lavc_param_prediction_method; + lavc_venc_context->brd_scale = lavc_param_brd_scale; + lavc_venc_context->bidir_refine = lavc_param_bidir_refine; +- lavc_venc_context->scenechange_factor = lavc_param_sc_factor; + if((lavc_param_video_global_header&1) + /*|| (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))*/){ +- lavc_venc_context->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ lavc_venc_context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + } + if(lavc_param_video_global_header&2){ +- lavc_venc_context->flags2 |= CODEC_FLAG2_LOCAL_HEADER; ++ lavc_venc_context->flags2 |= AV_CODEC_FLAG2_LOCAL_HEADER; + } + lavc_venc_context->mv0_threshold = lavc_param_mv0_threshold; + lavc_venc_context->refs = lavc_param_refs; +@@ -595,7 +564,7 @@ static int config(struct vf_instance *vf + switch(lavc_param_vpass){ + case 2: + case 3: +- lavc_venc_context->flags|= CODEC_FLAG_PASS2; ++ lavc_venc_context->flags|= AV_CODEC_FLAG_PASS2; + stats_file= fopen(passtmpfile, "rb"); + if(stats_file==NULL){ + mp_msg(MSGT_MENCODER,MSGL_ERR,"2pass failed: filename=%s\n", passtmpfile); +@@ -618,7 +587,7 @@ static int config(struct vf_instance *vf + fclose(stats_file); + /* fall through */ + case 1: +- lavc_venc_context->flags|= CODEC_FLAG_PASS1; ++ lavc_venc_context->flags|= AV_CODEC_FLAG_PASS1; + stats_file= fopen(passtmpfile, "wb"); + if(stats_file==NULL){ + mp_msg(MSGT_MENCODER,MSGL_ERR,"2pass failed: filename=%s\n", passtmpfile); +@@ -638,8 +607,8 @@ static int config(struct vf_instance *vf + lavc_venc_context->noise_reduction = 0; // nr=0 + lavc_venc_context->mb_decision = 0; // mbd=0 ("realtime" encoding) + +- lavc_venc_context->flags &= ~CODEC_FLAG_QPEL; +- lavc_venc_context->flags &= ~CODEC_FLAG_4MV; ++ lavc_venc_context->flags &= ~AV_CODEC_FLAG_QPEL; ++ lavc_venc_context->flags &= ~AV_CODEC_FLAG_4MV; + lavc_venc_context->trellis = 0; + av_dict_set(&opts, "mpv_flags", "-mv0", 0); + av_dict_set(&opts, "mpv_flags", "-qp_rd-cbp_rd", 0); +@@ -648,13 +617,11 @@ static int config(struct vf_instance *vf + } + } + +- lavc_venc_context->me_method = ME_ZERO+lavc_param_vme; +- + /* fixed qscale :p */ + if (lavc_param_vqscale >= 0.0) + { + mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_MPCODECS_UsingConstantQscale, lavc_param_vqscale); +- lavc_venc_context->flags |= CODEC_FLAG_QSCALE; ++ lavc_venc_context->flags |= AV_CODEC_FLAG_QSCALE; + lavc_venc_context->global_quality= + vf->priv->pic->quality = (int)(FF_QP2LAMBDA * lavc_param_vqscale + 0.5); + } +@@ -693,7 +660,7 @@ static int control(struct vf_instance *v + + switch(request){ + case VFCTRL_FLUSH_FRAMES: +- if(vf->priv->codec->capabilities & CODEC_CAP_DELAY) ++ if(vf->priv->codec->capabilities & AV_CODEC_CAP_DELAY) + while(encode_frame(vf, NULL, MP_NOPTS_VALUE) > 0); + return CONTROL_TRUE; + default: +--- a/libmpcodecs/vf_mcdeint.c ++++ b/libmpcodecs/vf_mcdeint.c +@@ -231,7 +231,7 @@ static int config(struct vf_instance *vf + avctx_enc->gop_size = 300; + avctx_enc->max_b_frames= 0; + avctx_enc->pix_fmt = AV_PIX_FMT_YUV420P; +- avctx_enc->flags = CODEC_FLAG_QSCALE | CODEC_FLAG_LOW_DELAY; ++ avctx_enc->flags = AV_CODEC_FLAG_QSCALE | AV_CODEC_FLAG_LOW_DELAY; + avctx_enc->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL; + avctx_enc->global_quality= 1; + av_dict_set(&opts, "memc_only", "1", 0); +@@ -245,11 +245,11 @@ static int config(struct vf_instance *vf + case 2: + avctx_enc->me_method= ME_ITER; + case 1: +- avctx_enc->flags |= CODEC_FLAG_4MV; ++ avctx_enc->flags |= AV_CODEC_FLAG_4MV; + avctx_enc->dia_size=2; + // avctx_enc->mb_decision = MB_DECISION_RD; + case 0: +- avctx_enc->flags |= CODEC_FLAG_QPEL; ++ avctx_enc->flags |= AV_CODEC_FLAG_QPEL; + } + + avcodec_open2(avctx_enc, enc, &opts); +--- a/gui/util/bitmap.c ++++ b/gui/util/bitmap.c +@@ -95,7 +95,7 @@ static int pngRead(const char *fname, gu + return 3; + } + +- data = av_malloc(len + FF_INPUT_BUFFER_PADDING_SIZE); ++ data = av_malloc(len + AV_INPUT_BUFFER_PADDING_SIZE); + + if (!data) { + fclose(file); diff -Nru mplayer-1.3.0/debian/patches/0202_glibc-2.27.patch mplayer-1.3.0/debian/patches/0202_glibc-2.27.patch --- mplayer-1.3.0/debian/patches/0202_glibc-2.27.patch 1970-01-01 00:00:00.000000000 +0000 +++ mplayer-1.3.0/debian/patches/0202_glibc-2.27.patch 2018-04-26 10:30:49.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Fix FTBFS with glibc 2.27 on i386 + cpudetect.c uses the non-standard "struct sigcontext" in its SIGILL handler. As + of glibc 2.27, this is not defined in strict standards compliant mode. + . + Fix by defining _GNU_SOURCE in cpudetect.c. +Author: James Cowgill +Bug: https://trac.mplayerhq.hu/ticket/2343 +Bug-Debian: https://bugs.debian.org/896805 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/cpudetect.c ++++ b/cpudetect.c +@@ -16,6 +16,8 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#define _GNU_SOURCE ++ + #include "mpx86asm.h" + #include "config.h" + #include "cpudetect.h" diff -Nru mplayer-1.3.0/debian/patches/0203_generic-arch-fallback.patch mplayer-1.3.0/debian/patches/0203_generic-arch-fallback.patch --- mplayer-1.3.0/debian/patches/0203_generic-arch-fallback.patch 1970-01-01 00:00:00.000000000 +0000 +++ mplayer-1.3.0/debian/patches/0203_generic-arch-fallback.patch 2018-04-27 10:25:31.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Fallback to the "generic" architecture if cpu detection fails + Should fix FTBFS on m68k and riscv. +Author: James Cowgill +Bug: https://trac.mplayerhq.hu/ticket/2344 +Bug-Debian: https://bugs.debian.org/728772 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/configure ++++ b/configure +@@ -1726,7 +1726,7 @@ if test -z "$_target" ; then + nios2) host_arch=nios2 ;; + vax) host_arch=vax ;; + xtensa*) host_arch=xtensa ;; +- *) host_arch=UNKNOWN ;; ++ *) host_arch=generic ;; + esac + } + set_host_arch "$(uname -m 2>&1)" diff -Nru mplayer-1.3.0/debian/patches/series mplayer-1.3.0/debian/patches/series --- mplayer-1.3.0/debian/patches/series 2017-10-21 22:15:10.000000000 +0000 +++ mplayer-1.3.0/debian/patches/series 2018-04-27 10:22:52.000000000 +0000 @@ -3,5 +3,9 @@ 0100_svn37857_CVE-2016-4352.patch 0101_svn37875_fix-crash-with-screenshot-filter.patch 0102_svn37932_ffmpeg3.4.patch +0103_svn38021_use-pkg-config-to-find-freetype.patch +0104_ffmpeg-4.0.patch 0200_fix_spelling_error_in_binary.patch 0201_PATH_MAX_HURD.patch +0202_glibc-2.27.patch +0203_generic-arch-fallback.patch diff -Nru mplayer-1.3.0/debian/watch mplayer-1.3.0/debian/watch --- mplayer-1.3.0/debian/watch 2017-10-21 22:01:01.000000000 +0000 +++ mplayer-1.3.0/debian/watch 2018-04-27 11:05:42.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -opts=pgpsigurlmangle=s/$/.asc/ http://www.mplayerhq.hu/MPlayer/releases/ MPlayer-(.+)\.tar\.xz +opts=pgpsigurlmangle=s/$/.asc/ https://mplayerhq.hu/MPlayer/releases/ MPlayer-(.+)\.tar\.xz