Update to a newer MPlayer snapshot.

Some bug fixes and that's about it.


------------------------------------------------------------------------
r38238 | reimar | 2021-01-23 17:26:28 -0500 (Sat, 23 Jan 2021) | 2 lines

vf_spp.c: Add missing include for LOCAL_ALIGNED_16.

------------------------------------------------------------------------
r38237 | reimar | 2021-01-23 14:05:29 -0500 (Sat, 23 Jan 2021) | 7 lines

codec-cfg.c: Also switch to av_strcasecmp.

Except when compiling stand-alone, a libavutil
dependency would complicate things when cross-compiling,
and the locale issue wth strcasecmp is less of a problem
when compiling it as a small stand-alone utility.

------------------------------------------------------------------------
r38236 | reimar | 2021-01-23 13:54:46 -0500 (Sat, 23 Jan 2021) | 2 lines

m_options.c: Add sys/types.h included needed for off_t.

------------------------------------------------------------------------
r38235 | reimar | 2021-01-23 13:22:15 -0500 (Sat, 23 Jan 2021) | 1 line

Switch to using DECLARE_ALIGNED for better portability.
------------------------------------------------------------------------
r38234 | reimar | 2021-01-23 13:22:13 -0500 (Sat, 23 Jan 2021) | 9 lines

Remove usage of variable-length stack arrays.

They have a couple of issues like complicating
stack hardening, stack sizes can be very different
and thus failures particularly unpredictable but
also compiler support is not universal.
In particular MSVC does not support it.
As a side benefit, at least some of the
code becomes easier to understand.
------------------------------------------------------------------------
r38233 | reimar | 2021-01-23 13:22:09 -0500 (Sat, 23 Jan 2021) | 10 lines

Remove use of strings.h header, use avutil/avstring.h instead.

The functions in strings.h are locale-dependent which
we do not want them to be.
In addition the header is only part of POSIX and not
the C standard so it is annoying for porting.
The main reason to look into it was testing the option
of compiling with MSVC to allow a Windows-on-Arm port.
However for that a compatibility wrapper would work
as well.
------------------------------------------------------------------------
r38232 | ib | 2021-01-22 07:08:20 -0500 (Fri, 22 Jan 2021) | 2 lines

Fix language names.

------------------------------------------------------------------------
r38231 | reimar | 2021-01-22 05:59:03 -0500 (Fri, 22 Jan 2021) | 2 lines

ao_null.c: Fix compile issue by adding missing include.

------------------------------------------------------------------------
r38230 | reimar | 2021-01-21 17:54:41 -0500 (Thu, 21 Jan 2021) | 2 lines

ao_dsound.c: Avoid pointer arithmetic on void * type.

------------------------------------------------------------------------
r38229 | reimar | 2021-01-21 17:48:36 -0500 (Thu, 21 Jan 2021) | 5 lines

ao_null.c: simplify by using GetTimerMS().

It is also slightly more portable than using
gettimeofday directly.

------------------------------------------------------------------------
r38228 | reimar | 2021-01-21 17:41:44 -0500 (Thu, 21 Jan 2021) | 5 lines

Makefile: Make use of the CC_C CC_O etc variables.

We defined them already for FFmpeg anyway, so
might as well make use of it.

------------------------------------------------------------------------
r38227 | reimar | 2021-01-20 14:45:32 -0500 (Wed, 20 Jan 2021) | 7 lines

sub/spudec.c: support swapped interlacing.

The code assumed that the data for the top field
would be first, however it is also possible that
the data for the bottom field is encoded first.

Fixes trac issue #2365.
------------------------------------------------------------------------
r38226 | reimar | 2021-01-20 13:35:02 -0500 (Wed, 20 Jan 2021) | 4 lines

configure: properly enable FFmpeg CodedBitstream parsers.

Fixes the warning described in trac #2370 though it
did not seem to affect playback for me.
------------------------------------------------------------------------
r38225 | reimar | 2021-01-20 13:03:35 -0500 (Wed, 20 Jan 2021) | 7 lines

mplayer.c: fix crashes for reinit_video_chain failures.

The error path should undo the reset, it should not
set things that the demuxer owns to NULL.
In particular, the rawdv demuxer would crash if
opening the vo failed.
Fixes trac issue #2326.
------------------------------------------------------------------------
r38224 | reimar | 2021-01-20 13:03:34 -0500 (Wed, 20 Jan 2021) | 10 lines

ad_hwmpa.c: avoid potential out of bounds.

This happens when the frame size is larger than the
size of the decoded audio - obviously this should not
happen in real audio files as it doesn't make sense
to select a compression mode that increases size.
Note that unless all other MPEG audio codecs are disabled
this codec will never be auto-selected.

Fixes trac issue #2357.
------------------------------------------------------------------------
r38223 | reimar | 2021-01-20 13:03:33 -0500 (Wed, 20 Jan 2021) | 3 lines

asfheader.c: add sanity check of type_size.

Fixes trac issue #2358.
------------------------------------------------------------------------
r38222 | reimar | 2021-01-20 13:03:32 -0500 (Wed, 20 Jan 2021) | 3 lines

demux_pva.c: fix data types and use calloc.

Improves behaviour for trac issue #2359.
------------------------------------------------------------------------
r38221 | reimar | 2021-01-20 13:03:31 -0500 (Wed, 20 Jan 2021) | 5 lines

demux_realaud.c: check stream_read_char for EOF.

Also remove some code duplication while at it.

Fixes trac #2360.
------------------------------------------------------------------------
r38220 | reimar | 2021-01-20 13:03:29 -0500 (Wed, 20 Jan 2021) | 3 lines

ebml.c: fix bad length check.

Fixes trac issue #2361.
------------------------------------------------------------------------
r38219 | reimar | 2021-01-20 13:03:28 -0500 (Wed, 20 Jan 2021) | 1 line

demux_lavf: avoid several deprecated lavf features.
------------------------------------------------------------------------
r38218 | reimar | 2021-01-20 13:03:27 -0500 (Wed, 20 Jan 2021) | 1 line

vd_ffmpeg: support receiving multiple frames in a row.
------------------------------------------------------------------------
r38217 | reimar | 2021-01-20 13:03:26 -0500 (Wed, 20 Jan 2021) | 1 line

vd_ffmpeg: Switch to newer lavc decode API.
------------------------------------------------------------------------
r38216 | reimar | 2021-01-20 13:03:25 -0500 (Wed, 20 Jan 2021) | 1 line

ad_ffmpeg: switch to new lavc API.
------------------------------------------------------------------------
r38215 | reimar | 2021-01-20 13:03:23 -0500 (Wed, 20 Jan 2021) | 1 line

av_helpers: switch to new lavc audio encode API.
------------------------------------------------------------------------
r38214 | ib | 2021-01-02 14:40:46 -0500 (Sat, 02 Jan 2021) | 2 lines

Update year.

------------------------------------------------------------------------
r38213 | reimar | 2020-12-31 14:46:32 -0500 (Thu, 31 Dec 2020) | 4 lines

ao_coreaudio: quick hack to make it work on modern OSX.

The APIs were renamed to be audio-specific.

------------------------------------------------------------------------
r38212 | reimar | 2020-12-29 16:02:05 -0500 (Tue, 29 Dec 2020) | 5 lines

libvo: Add missing #ifdef.

MPlayer configured for corevideo enabled but gl
disabled would fail to build otherwise.

------------------------------------------------------------------------
r38211 | reimar | 2020-12-29 08:00:23 -0500 (Tue, 29 Dec 2020) | 5 lines

vo_gl: Enable PBO upload on Apple Silicon.

It is much faster than regular texture uploads,
even if an extra memcpy is needed.

------------------------------------------------------------------------
r38210 | reimar | 2020-12-29 06:01:21 -0500 (Tue, 29 Dec 2020) | 2 lines

libvo: quick hack to prefer vo_gl over corevideo.

------------------------------------------------------------------------
r38209 | reimar | 2020-12-29 05:58:51 -0500 (Tue, 29 Dec 2020) | 5 lines

vo_corevideo: Fix it so it updates the screen on modern macOS.

However it is still super-slow, so it might make much more
sense to make vo_gl the default, unless it is easy to fix.

------------------------------------------------------------------------
r38208 | reimar | 2020-12-29 05:33:14 -0500 (Tue, 29 Dec 2020) | 2 lines

osx_objc_common: simplify code to create menu.

------------------------------------------------------------------------
r38207 | reimar | 2020-12-29 00:31:02 -0500 (Tue, 29 Dec 2020) | 2 lines

osx_objc_common: Fix selector so fullscreen works.

------------------------------------------------------------------------
r38206 | reimar | 2020-12-29 00:11:20 -0500 (Tue, 29 Dec 2020) | 2 lines

osx_objc_common: More "retina" display fixes.

------------------------------------------------------------------------
r38205 | reimar | 2020-12-28 23:43:38 -0500 (Mon, 28 Dec 2020) | 2 lines

osx_objc_common: Fix video size on "retina" displays.

------------------------------------------------------------------------
r38204 | reimar | 2020-12-28 14:05:45 -0500 (Mon, 28 Dec 2020) | 4 lines

configure: Add proper detection for HAVE_AS_FUNC.

Fixes compilation on MacOS with M1 CPUs.

------------------------------------------------------------------------
r38203 | komh | 2020-11-30 06:16:39 -0500 (Mon, 30 Nov 2020) | 5 lines

configure: set minimum arch to i586 on --enable-runtime-cpudetection

__atomic_fetch_add(__sync_fetch_and_add) builtin requires i586 at least.


------------------------------------------------------------------------
r38202 | reimar | 2020-11-01 10:07:49 -0500 (Sun, 01 Nov 2020) | 3 lines

stream_ffmpeg: add -lavfstreamopts option.

Allows specifying options to ffmpeg-based streams.
------------------------------------------------------------------------
r38201 | reimar | 2020-11-01 10:07:47 -0500 (Sun, 01 Nov 2020) | 5 lines

vf_scale: add generic libswscale options support.

Allows setting any of the options exposed by libswscale,
in particular for example source and destination colorspace
range.
------------------------------------------------------------------------
r38200 | reimar | 2020-11-01 10:07:45 -0500 (Sun, 01 Nov 2020) | 1 line

configure: Fix typo in warning message.
------------------------------------------------------------------------
r38199 | reimar | 2020-11-01 10:07:44 -0500 (Sun, 01 Nov 2020) | 4 lines

ad_spdif: Use avformat_free_context to free context.

This avoids memleaks and in newest FFmpeg versions also
compile errors.
------------------------------------------------------------------------
r38198 | komh | 2020-10-11 02:36:37 -0400 (Sun, 11 Oct 2020) | 15 lines

loader: fix compilation

-----
loader/win32.c: In function 'mreq_private':
loader/win32.c:354:28: error: implicit declaration of function 'av_malloc'; did 
you mean 'valloc'? [-Werror=implicit-function-declaration]
  354 |     alloc_header* header = av_malloc(nsize);
      |                            ^~~~~~~~~
      |                            valloc
loader/win32.c:354:28: warning: initialization of 'alloc_header *' {aka 'struct 
alloc_header_t *'} from 'int' makes pointer from integer without a cast 
[-Wint-conversion]
loader/win32.c: In function 'my_release':
loader/win32.c:439:5: error: implicit declaration of function 'av_free' 
[-Werror=implicit-function-declaration]
  439 |     av_free(header);
      |     ^~~~~~~
-----

------------------------------------------------------------------------
r38197 | reimar | 2020-08-30 13:44:21 -0400 (Sun, 30 Aug 2020) | 5 lines

configure: check that stdatomic.h actually works correctly.

In particular, that it does not create e.g. dependencies on
libatomic. In that case the compat fallback will actually work better.

------------------------------------------------------------------------
r38196 | reimar | 2020-08-30 11:54:24 -0400 (Sun, 30 Aug 2020) | 2 lines

Changelog: update for changes in default Arm compilation options

------------------------------------------------------------------------
r38195 | reimar | 2020-08-30 11:51:28 -0400 (Sun, 30 Aug 2020) | 5 lines

configure: allow using --enable-runtime-cpudetection for Arm builds.

This is mostly to allow undoing the effects of the previous
patch which adds -march=native if it is not set

------------------------------------------------------------------------
r38194 | reimar | 2020-08-30 11:27:41 -0400 (Sun, 30 Aug 2020) | 8 lines

configure: Fix arm CPU extension selection

If runtime cpudetection is off, we need to set all of
march, mcpu and mfpu.
Otherwise compiling on e.g. Rasbian will result in
a build with no NEON support even when the CPU
supports it.

------------------------------------------------------------------------
r38193 | al | 2020-08-21 17:13:38 -0400 (Fri, 21 Aug 2020) | 8 lines

configure: Fix build with newer internal FFmpeg

In FFmpeg commit 1841921277 A53 closed caption parsing was separated
into a module of its own and is now shared by some codecs.

Activate that module.


------------------------------------------------------------------------
r38192 | reimar | 2020-06-14 13:55:21 -0400 (Sun, 14 Jun 2020) | 7 lines

Remove usage of memalign.

Switch to av_malloc instead.
Only vo_vesa remains using memalign as it requests 64-byte alignment,
which is more than av_malloc provides.
The fallback for memalign has been plain malloc, which meant crashes
on e.g. Win32 where malloc is not sufficiently aligned.
------------------------------------------------------------------------
r38191 | reimar | 2020-06-06 11:13:32 -0400 (Sat, 06 Jun 2020) | 4 lines

osd.c: Disable SSE2 optimization on 32-bit Windows.

It seems to cause random crashes, and fixing it will
take some time as I am not able to reproduce.
------------------------------------------------------------------------
r38190 | reimar | 2020-06-06 11:13:31 -0400 (Sat, 06 Jun 2020) | 1 line

menu.c: add missing libavutil/mem.h include for DECLARE_ALIGNED
------------------------------------------------------------------------
r38189 | reimar | 2020-06-06 11:13:29 -0400 (Sat, 06 Jun 2020) | 1 line

configure: fix FFmpeg compilation when zlib is not available.
------------------------------------------------------------------------
r38188 | reimar | 2020-05-28 14:25:15 -0400 (Thu, 28 May 2020) | 7 lines

menu.c: optimize libmenu box drawing.

As the lines it draws are all identical it is enough to
allocate a single line and draw with stride 0.
Admittedly it would be even more efficient to have
a special function for this, but that would be
enough extra effort to not seem worth it.
------------------------------------------------------------------------
r38187 | reimar | 2020-05-27 16:25:01 -0400 (Wed, 27 May 2020) | 10 lines

Fix crashes due to insufficient alignment.

Images blended on top of the video via draw_alpha
need to be aligned to 16 bytes for the new SSE2
accelerated routines.
Fix the menu code to provide that 16 bytes alignment.
The menu_draw_box code was actually broken even
before the SSE2 code since it did not request the
even the 8 byte alignment even the pre-SSE2 code
already needed.
------------------------------------------------------------------------
r38186 | al | 2020-05-26 16:33:56 -0400 (Tue, 26 May 2020) | 8 lines

configure: Make strip tool configurable

Initially based on a patch by Hank Wang >ex0804992 at itri org tw<

Use case of the original author:
When cross-compiling use the cross-strip for make install.


------------------------------------------------------------------------
r38185 | al | 2020-05-23 08:46:49 -0400 (Sat, 23 May 2020) | 5 lines

configure: Disable FFmpeg encoder wrappers for MediaFoundation

Fix build with internal FFmpeg on systems without MediaFoundation.


------------------------------------------------------------------------
r38184 | ib | 2020-03-03 12:33:32 -0500 (Tue, 03 Mar 2020) | 4 lines

Fix linking error of the non-GUI Wine build.

There is an undefined reference to 'ExtractIconA'.

------------------------------------------------------------------------
r38183 | ib | 2020-03-03 05:47:07 -0500 (Tue, 03 Mar 2020) | 4 lines

Fix compilation of the Win32 GUI Wine build.

Add missing definition of gui_vinfo.

------------------------------------------------------------------------
r38182 | ib | 2020-03-03 05:15:22 -0500 (Tue, 03 Mar 2020) | 4 lines

Fix compilation of non-X11 OpenGL video output driver.

Patch by Stephen Sheldon, sfsheldo gmail com.



Index: Makefile
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.310
diff -u -p -u -p -r1.310 Makefile
--- Makefile    4 Oct 2020 18:33:40 -0000       1.310
+++ Makefile    24 Jan 2021 09:36:01 -0000
@@ -2,10 +2,9 @@
 
 COMMENT=       movie player supporting many formats
 
-V=             20200229
+V=             20210124
 FFMPEG_V=      4.3.1
 DISTNAME=      mplayer-${V}
-REVISION=      3
 CATEGORIES=    x11 multimedia
 MASTER_SITES=  https://comstyle.com/source/
 EXTRACT_SUFX=  .tar.xz
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.52
diff -u -p -u -p -r1.52 distinfo
--- distinfo    1 Mar 2020 10:01:04 -0000       1.52
+++ distinfo    24 Jan 2021 09:36:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (mplayer-20200229.tar.xz) = P3D6MTpC986g5SpvBBiCDQI2Kgh45VsxnH+rNavgIz4=
-SIZE (mplayer-20200229.tar.xz) = 5166240
+SHA256 (mplayer-20210124.tar.xz) = lFK2anWHpV8JKwI29rkQdCpopUJgKygmFcfIn+SWcFI=
+SIZE (mplayer-20210124.tar.xz) = 5169156
Index: patches/patch-DOCS_man_en_mplayer_1
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-DOCS_man_en_mplayer_1,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 patch-DOCS_man_en_mplayer_1
--- patches/patch-DOCS_man_en_mplayer_1 1 Mar 2020 10:01:04 -0000       1.20
+++ patches/patch-DOCS_man_en_mplayer_1 24 Jan 2021 09:36:37 -0000
@@ -12,7 +12,7 @@ Index: DOCS/man/en/mplayer.1
  .
  .TP
  .B \-channels <number> (also see \-af channels)
-@@ -12268,7 +12268,7 @@ mplayer dvd://1 \-dvdangle 2
+@@ -12277,7 +12277,7 @@ mplayer dvd://1 \-dvdangle 2
  .PP
  .B Play from a different DVD device:
  .nf
@@ -21,7 +21,7 @@ Index: DOCS/man/en/mplayer.1
  .fi
  .
  .PP
-@@ -12334,11 +12334,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
+@@ -12343,11 +12343,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
  .PP
  .B Play DTS-CD with passthrough:
  .nf
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-configure,v
retrieving revision 1.88
diff -u -p -u -p -r1.88 patch-configure
--- patches/patch-configure     1 Mar 2020 10:01:04 -0000       1.88
+++ patches/patch-configure     24 Jan 2021 09:36:35 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure,v 1.88 2020/03
 Index: configure
 --- configure.orig
 +++ configure
-@@ -1509,39 +1509,39 @@ echo configuration: $configuration > "$TMPLOG"
+@@ -1514,39 +1514,39 @@ echo configuration: $configuration > "$TMPLOG"
  echo >> "$TMPLOG"
  
  
@@ -75,7 +75,7 @@ Index: configure
  list_subparts() {
    test ! -e ffmpeg/libav${3} && return 1
    pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
-@@ -2446,7 +2446,7 @@ case "$host_arch" in
+@@ -2465,7 +2465,7 @@ case "$host_arch" in
      arch='sparc'
      iproc='sparc'
      if test "$host_arch" = "sparc64" ; then
@@ -84,7 +84,7 @@ Index: configure
        proc='ultrasparc'
        def_fast_64bit='#define HAVE_FAST_64BIT 1'
      elif sunos ; then
-@@ -2815,7 +2815,7 @@ cat > $TMPC << EOF
+@@ -2840,7 +2840,7 @@ cat > $TMPC << EOF
  int ff_extern;
  EOF
  cc_check -c || die "Symbol mangling check failed."
@@ -93,7 +93,7 @@ Index: configure
  extern_prefix=${sym%%ff_extern*}
  def_extern_asm="#define EXTERN_ASM $extern_prefix"
  def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
-@@ -2875,7 +2875,7 @@ else
+@@ -2905,7 +2905,7 @@ else
  fi
  
  CFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg $CFLAGS"
@@ -102,7 +102,7 @@ Index: configure
  
  # On glibc, add some more CPPFLAGS for enabling required functionality.
  cpp_condition_check features.h "defined __GLIBC__" &&
-@@ -2956,7 +2956,7 @@ elif test $relocatable = "yes" ; then
+@@ -2986,7 +2986,7 @@ elif test $relocatable = "yes" ; then
  fi
  echores $relocatable
  
@@ -111,7 +111,7 @@ Index: configure
    # Checking assembler (_as) compatibility...
    # Added workaround for older as that reads from stdin by default - atmos
    as_version=$(echo '' | $_as -version 2>&1 | sed -n 's/^.*assembler 
\(version \)*\([0-9.]*\).*$/\2/p')
-@@ -4383,8 +4383,8 @@ echores "$gettimeofday"
+@@ -4420,8 +4420,8 @@ echores "$gettimeofday"
  echocheck "clock_gettime()"
  clock_gettime=no
  def_clock_gettime='#undef HAVE_CLOCK_GETTIME'
@@ -122,7 +122,7 @@ Index: configure
  echores "$clock_gettime"
  
  
-@@ -6366,7 +6366,7 @@ echocheck "cdparanoia"
+@@ -6403,7 +6403,7 @@ echocheck "cdparanoia"
  if test "$_cdparanoia" = auto ; then
      _cdparanoia=no
      for inc_tmp in "" "-I/usr/include/cdda" "-I/usr/local/include/cdda" ; do
@@ -131,7 +131,7 @@ Index: configure
          _cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp" && break
      done
  fi
-@@ -8265,6 +8265,7 @@ extra_ldflags="$extra_ldflags $libm"
+@@ -8302,6 +8302,7 @@ extra_ldflags="$extra_ldflags $libm"
  # XML documentation tests
  echocheck "XML catalogs"
  for try_catalog in \
@@ -139,7 +139,7 @@ Index: configure
    /etc/sgml/catalog \
    /usr/share/xml/docbook/*/catalog.xml \
    /opt/local/share/xml/docbook-xml/*/catalog.xml \
-@@ -8292,6 +8293,7 @@ fi
+@@ -8329,6 +8330,7 @@ fi
  
  echocheck "XML chunked stylesheet"
  for try_chunk_xsl in \
@@ -147,7 +147,7 @@ Index: configure
    /usr/share/xml/docbook/*/html/chunk.xsl \
    /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl \
    /usr/share/sgml/docbook/yelp/docbook/html/chunk.xsl \
-@@ -8317,6 +8319,7 @@ fi
+@@ -8354,6 +8356,7 @@ fi
  
  echocheck "XML monolithic stylesheet"
  for try_docbook_xsl in \
@@ -155,7 +155,7 @@ Index: configure
    /usr/share/xml/docbook/*/html/docbook.xsl \
    /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl \
    /usr/share/sgml/docbook/yelp/docbook/html/docbook.xsl \
-@@ -8370,6 +8373,7 @@ EOF
+@@ -8407,6 +8410,7 @@ EOF
  echocheck "XML DTD"
  #FIXME: This should prefer higher version numbers, not the other way around ..
  for try_dtd in \
@@ -163,7 +163,7 @@ Index: configure
    /usr/share/xml/docbook/*/dtd/4*/docbookx.dtd \
    /usr/share/xml/docbook/*/docbookx.dtd \
    /usr/share/sgml/docbook/*/docbookx.dtd \
-@@ -9529,9 +9533,6 @@ cmp -s "$TMPH" config.h || mv -f "$TMPH" config.h
+@@ -9565,9 +9569,6 @@ cmp -s "$TMPH" config.h || mv -f "$TMPH" config.h
  
  ############################################################################
  
@@ -173,7 +173,7 @@ Index: configure
  # Create avconfig.h for FFmpeg.
  cat > "$TMPH" << EOF
  /* Generated by mpconfigure */
-@@ -9623,8 +9624,6 @@ print_enabled_components libavformat/demuxer_list.c AV
+@@ -9659,8 +9660,6 @@ print_enabled_components libavformat/demuxer_list.c AV
  print_enabled_components libavformat/muxer_list.c AVOutputFormat muxer_list 
$libavmuxers
  print_enabled_components libavformat/protocol_list.c URLProtocol 
url_protocols $libavprotocols
  print_enabled_filters libavfilter/filter_list.c AVFilter filter_list 
$libavfilters

Reply via email to