<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a973cb5aaf438ad3c6ec631a123354489a2a532d">https://github.com/macports/macports-ports/commit/a973cb5aaf438ad3c6ec631a123354489a2a532d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a973cb5 VLC: make compatible with FFmpeg 4.0 and lua 5.3
</span>a973cb5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a973cb5aaf438ad3c6ec631a123354489a2a532d
</span>Author: R.J.V. Bertin <rjvbertin@gmail.com>
AuthorDate: Sun May 13 11:58:43 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> VLC: make compatible with FFmpeg 4.0 and lua 5.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also, drop the Qt variants as they never worked properly on Mac and didn't even build anymore.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/55164
</span>---
multimedia/VLC/Portfile | 168 +---
...h-configure-no-error-on-missing-prototypes.diff | 10 -
...re.ac-no-arch.patch => patch-configure.ac.diff} | 12 +
multimedia/VLC/files/patch-ffmpeg3-compat.diff | 4 +-
multimedia/VLC/files/patch-ffmpeg4-compat.diff | 872 +++++++++++++++++++++
multimedia/VLC/files/patch-ffmpegVLC.diff | 82 --
multimedia/VLC/files/patch-for-lua52.diff | 50 --
multimedia/VLC/files/patch-for-lua53.diff | 272 +++++++
multimedia/VLC/files/patch-simplepreferences.diff | 13 -
multimedia/VLC/files/patch-static_assert.diff | 27 +-
...-vda-ffmpeg34.diff => patch-vda-ffmpeg34+.diff} | 0
multimedia/VLC/files/patch-vlc-no-qt5.diff | 13 -
multimedia/VLC/files/patch-vlc-qt-configureac.diff | 34 -
multimedia/VLC/files/patch-vlc-qt4mac.diff | 97 ---
multimedia/VLC/files/static_assert.patch | 15 -
15 files changed, 1200 insertions(+), 469 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/Portfile b/multimedia/VLC/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index be0d7f0..7a0704d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,13 +29,6 @@ subport lib${name} {
</span> homepage http://www.videolan.org/vlc/libvlc.html
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set use_ffmpeg_VLC no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[tbool use_ffmpeg_VLC]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subport ffmpeg-VLC {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set FFMPEG_VLC_PREFIX ${prefix}/lib/vlc/ffmpeg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${subport} eq ${name}} {
conflicts lib${name}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +42,7 @@ supported_archs x86_64
</span> ##
if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
version 2.2.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 4
</span> license GPL-2+
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,24 +54,15 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> checksums rmd160 4434e91384520fe1fe129a52f5d66d61e4404a9a \
sha256 9bf046848fb56d93518881b39099b8288ee005d5ba0ddf705b6f6643b8d562ec
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exist ::env(MACPORTS_COMPRESS_WORKDIR)] && $::env(MACPORTS_COMPRESS_WORKDIR)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Enable HFS compression.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${prefix}/bin/bsdtar]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.post_args \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "| ${prefix}/bin/bsdtar -x --hfsCompression"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Enable HFS compression of the workdir if the compress_workdir PortGroup is installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${filespath}/../../../_resources/port1.0/group/compress_workdir-1.0.tcl]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup compress_workdir 1.0
</span> }
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[tbool use_ffmpeg_VLC]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ffmpeg-VLC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ffmpeg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:a52dec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:ffmpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:a52dec \
</span> port:avahi \
port:bzip2 \
port:faad2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,6 +130,8 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> port:vcdimager \
port:x264 \
port:x265
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:libaacs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libbdplus
</span>
pre-fetch {
if {${os.platform} eq "darwin" && ${os.major} < 10} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,61 +140,29 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# port:opencv depends on port:ffmpeg and thus enters in conflict with us depending on our own ffmpeg build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 1 viable solution as long as this is the case: drop the opencv filter.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# depends_lib-append port:opencv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# # the +qt5 and/or +qt4 variants of port:opencv currently lead to build errors. A patch has
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# # been submitted (but not included) that resolves the issue for qt4, not yet for qt5.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# # https://trac.macports.org/ticket/50709
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# # For regular users a single check in the pre-fetch would suffice, but this maintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# # needs the check at other opportune moments too.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# proc check_opencv {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# global subport
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if {![active_variants opencv "" {qt4 qt5}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ui_error "${subport} cannot currently be built against port:opencv with the qt5 variant.\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Install port:opencv without that variant and try again. This is only a build conflict; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# after building you can reactivate your preferred opencv variant"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# return -code error "Install or activate port:opencv without the qt5 variant before building ${subport}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# check_opencv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# check_opencv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# check_opencv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patchfiles-append patch-opencv_includes.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# # The opencv example apparently builds on 10.11 but I'm having issues with it on 10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# # it doesn't appear to be indispensable, so simply skip it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patchfiles-append patch-no-opencv_example.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # VLC 2.2.2 should have full Lua 5.3 compatibility, for now, depend on port:lua52
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # That requires the patch-for-lua52.diff which is appended to patchfiles below.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # update 2.2.2 : lua 5.3 gives compiler syntax errors so we stick with 5.2 for now.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:lua52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:lua
</span>
# VLC doesn't currently build for me using port:clang-3.8
compiler.blacklist-append \
gcc-4.2 llvm-gcc-4.2 macports-clang-3.8 {clang < 300}
patchfiles buildfix-package.mak.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ac-no-arch.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-configure.ac.diff \
</span> PR-34741-no__clang_version__.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- static_assert.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-static_assert.diff \
</span> no-sparkle.patch \
patch-vlc-no-O4.diff \
patch-soundfont-path.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[tbool use_ffmpeg_VLC]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ffmpegVLC.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # FFMpeg 3 compatibility (see attributions in the patchfile)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ffmpeg3-compat.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform darwin {
</span> patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ffmpeg3-compat.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-vda-ffmpeg34.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-vda-ffmpeg34+.diff
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # FFMpeg 4 compatibility (by RJVB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ffmpeg4-compat.diff
</span>
post-patch {
if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} == "libc++"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -217,41 +171,10 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> }
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/modules/codec/fluidsynth.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[tbool use_ffmpeg_VLC]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch source using ffmpeg to use the correct header file locations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir {libavcodec libavformat libavresample libavutil libpostproc libswresample libswscale} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach module {access codec/avcodec demux/avformat hw/vdpau packetizer video_chroma} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach cf [glob -nocomplain ${worksrcpath}/modules/${module}/*.c] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|${dir}/|${dir}-VLC/|g" ${cf}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach cf [glob -nocomplain ${worksrcpath}/modules/${module}/*.h] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|${dir}/|${dir}-VLC/|g" ${cf}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|${dir}/|${dir}-VLC/|g" ${worksrcpath}/configure.ac ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|postproc/|postproc-VLC/|g" ${worksrcpath}/configure.ac ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|libpostproc/|libpostproc-VLC/|g" ${worksrcpath}/modules/video_filter/postproc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|HAVE_LIBAVUTIL_AV|HAVE_LIBAVUTIL_VLC_AV|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/modules/codec/avcodec/avcommon.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/modules/codec/avcodec/avcommon_compat.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|HAVE_LIBAVFORMAT_AV|HAVE_LIBAVFORMAT_VLC_AV|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/modules/codec/avcodec/avcommon.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/modules/codec/avcodec/avcommon_compat.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|HAVE_LIBAVCODEC_AV|HAVE_LIBAVCODEC_VLC_AV|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/modules/codec/avcodec/avcommon.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/modules/codec/avcodec/avcommon_compat.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|HAVE_LIBSWSCALE_SW|HAVE_LIBSWSCALE_VLC_SW|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/modules/codec/avcodec/avcommon.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/modules/codec/avcodec/avcommon_compat.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "patch -Np0 -i ${filespath}/patch-static_assert.diff"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # do autoreconf only the first time around
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_autoreconf [expr ![file exists ${worksrcpath}/config.status]]
</span> autoreconf.cmd ./bootstrap
autoreconf.pre_args
autoreconf.args
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -259,11 +182,7 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span>
configure.env-append \
CXXCPP="${configure.cxx} -E"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[tbool use_ffmpeg_VLC]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # splice in ffmpeg-VLC's pkgconfig path, hoping that PKG_CONFIG_PATH hasn't been set by anyone else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_CONFIG_PATH=${FFMPEG_VLC_PREFIX}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.args-append DESTDIR=${worksrcpath}/dest_ignore V=1
# gl.c:121:3: error: Platform not recognized.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -400,26 +319,6 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> configure.args-append --with-x --enable-xvideo --enable-xcb
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} ne "lib${name}"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant qt4 conflicts qt5 description {Build using Qt4 UI. This will use qt4-mac. Experimental and probably dysfunctional} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-vlc-no-qt5.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-vlc-qt-configureac.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-simplepreferences.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-qt --enable-qt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant qt5 conflicts qt4 description {Build using Qt5 UI. This will use qt5-mac. Experimental and probably dysfunctional} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-vlc-qt-configureac.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-simplepreferences.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-qt --enable-qt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant quartz {
depends_lib-delete port:libsamplerate
depends_lib-append port:BGHUDAppKit
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -452,17 +351,15 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span>
if {${subport} ne "lib${name}"} {
variant full \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- requires huge quartz smb x11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requires huge quartz smb \
</span> description {Enable all variants except x11 (and except freerdp, currently)} {}
} else {
variant full \
requires huge quartz smb \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description {Enable all variants (except freerdp, currently)} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {Enable all variants except x11 (and except freerdp, currently)} {}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# # this patchfile can probably go with VLC 2.2.2, or should be reviewed then.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# # update 2.2.2 : lua 5.3 gives compiler syntax errors so we stick with 5.2 for now.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-for-lua52.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-for-lua53.diff
</span>
# make 10.12 and later ignore all QTKit code in modules/gui/macosx/open.m
patchfiles-append patch-really-no-qtkit.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -503,7 +400,7 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> post-destroot {
file delete {*}[glob ${destroot}${prefix}/lib/vlc/plugins/*/*.la]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset qt4] || [variant_isset qt5] || [variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset quartz]} {
</span> if {${subport} ne "lib${name}"} {
copy ${worksrcpath}/VLC.app ${destroot}${applications_dir}/VLC.app
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -547,9 +444,6 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> }
}
post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset qt4] || [variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append "The Qt interface modules for VLC are currently dysfunctional. If you encounter bugs with them, please file them with VLC and not MacPorts."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> system "${prefix}/lib/vlc/vlc-cache-gen -f ${prefix}/lib/vlc"
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -557,14 +451,4 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> in ${prefix}/share/sounds/sf2, for instance from port:generaluser-soundfont."
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-################# support port ffmpeg-VLC ##################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq "ffmpeg-VLC"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {source "${portpath}/Portfile.ffmpeg.tcl"} err]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts stderr "Error reading Portfile.ffmpeg.tcl: $err"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # kate: backspace-indents true; indent-pasted-text true; indent-width 4; keep-extra-spaces true; remove-trailing-spaces modified; replace-tabs true; replace-tabs-save true; syntax Tcl/Tk; tab-indents true; tab-width 4;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/ffmpeg/patch-configure-no-error-on-missing-prototypes.diff b/multimedia/VLC/files/ffmpeg/patch-configure-no-error-on-missing-prototypes.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 61a4335..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/ffmpeg/patch-configure-no-error-on-missing-prototypes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.old 2015-09-27 18:43:30.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2015-09-27 18:44:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5683,7 +5683,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_optflags -fno-tree-vectorize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_cflags -Werror=format-security
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_cflags -Werror=implicit-function-declaration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- check_cflags -Werror=missing-prototypes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_cflags -Werror=return-type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_cflags -Werror=vla
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_cflags -Wformat
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/configure.ac-no-arch.patch b/multimedia/VLC/files/patch-configure.ac.diff
</span>similarity index 72%
rename from multimedia/VLC/files/configure.ac-no-arch.patch
rename to multimedia/VLC/files/patch-configure.ac.diff
<span style='display:block; white-space:pre;color:#808080;'>index f1e7d28..f681fd5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/configure.ac-no-arch.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,3 +41,15 @@ index 318cad4..9350f90 100644
</span> VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,AppKit])
VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation,-framework,CoreServices])
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -970,9 +970,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Check for fast maths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- RDC_PROG_CC_FFLAGS([no-math-errno unsafe-math-optimizations no-rounding-math no-signaling-nans cx-limited-range])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RDC_PROG_CC_FFLAGS([no-math-errno unsafe-math-optimizations cx-limited-range])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_LANG_PUSH(C++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- RDC_PROG_CXX_FFLAGS([no-math-errno unsafe-math-optimizations no-rounding-math no-signaling-nans cx-limited-range])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RDC_PROG_CXX_FFLAGS([no-math-errno unsafe-math-optimizations cx-limited-range])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_LANG_POP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AH_BOTTOM([
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-ffmpeg3-compat.diff b/multimedia/VLC/files/patch-ffmpeg3-compat.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7dc5411..3dc2d8e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-ffmpeg3-compat.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/files/patch-ffmpeg3-compat.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,8 +191,8 @@ diff -Naur configure.ac configure.ac
</span> PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
- PKG_CHECK_EXISTS([libavutil < 55],, [
- AC_MSG_ERROR([libavutil versions 55 and later are not supported.])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_EXISTS([libavutil < 56],, [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_ERROR([libavutil versions 56 and later are not supported.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKG_CHECK_EXISTS([libavutil < 57],, [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_ERROR([libavutil versions 57 and later are not supported.])
</span> ])
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-ffmpeg4-compat.diff b/multimedia/VLC/files/patch-ffmpeg4-compat.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c748735
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/files/patch-ffmpeg4-compat.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,872 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/codec/avcodec/avcommon.h modules/codec/avcodec/avcommon.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f967473b472af234a740accdff5ac30a0ea91a81..e8f0a067f88655018214bba192e9fe9c4aefc167 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/codec/avcodec/avcommon.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/codec/avcodec/avcommon.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,6 +60,20 @@ static inline AVDictionary *vlc_av_get_options(const char *psz_opts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return options;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static inline void vlc_av_get_options_ng(const char *psz_opts, AVDictionary** pp_dict)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ config_chain_t *cfg = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ config_ChainParseOptions(&cfg, psz_opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while (cfg) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ config_chain_t *next = cfg->p_next;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ av_dict_set(pp_dict, cfg->psz_name, cfg->psz_value, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ free(cfg->psz_name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ free(cfg->psz_value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ free(cfg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cfg = next;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline void vlc_init_avutil(vlc_object_t *obj)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int level = AV_LOG_QUIET;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/codec/avcodec/avcommon_compat.h modules/codec/avcodec/avcommon_compat.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3c66a1e1b30a2ac742adbe40225cc363590c9b98..d3864448b7f059cfc72fc84262e8e728de8a6c0a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/codec/avcodec/avcommon_compat.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/codec/avcodec/avcommon_compat.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,7 +2,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * avcodec.h: decoder and encoder using libavcodec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *****************************************************************************
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Copyright (C) 2001-2013 VLC authors and VideoLAN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * $Id: 3fc14dc163885eb5ac80d955e3159a506f0dcfed $
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * $Id: 8f9c12081cf8524424d4611822a69a3a16cf1f05 $
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Authors: Laurent Aimar <fenrir@via.ecp.fr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Jean-Baptiste Kempf <jb@videolan.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,6 +25,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef AVCOMMON_COMPAT_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define AVCOMMON_COMPAT_H 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define AVPROVIDER(lib) ((lib##_VERSION_MICRO < 100) ? "libav" : "ffmpeg")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_LIBAVCODEC_AVCODEC_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <libavcodec/avcodec.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,447 +38,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ( (LIBAVCODEC_VERSION_MICRO < 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if LIBAVCODEC_VERSION_MAJOR < 54
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_PICTURE_TYPE_B FF_B_TYPE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_PICTURE_TYPE_I FF_I_TYPE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_PICTURE_TYPE_P FF_P_TYPE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_SAMPLE_FMT_NONE SAMPLE_FMT_NONE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_SAMPLE_FMT_U8 SAMPLE_FMT_U8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_SAMPLE_FMT_S16 SAMPLE_FMT_S16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_SAMPLE_FMT_S32 SAMPLE_FMT_S32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_SAMPLE_FMT_FLT SAMPLE_FMT_FLT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_SAMPLE_FMT_DBL SAMPLE_FMT_DBL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef AV_CH_FRONT_LEFT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_CH_FRONT_LEFT CH_FRONT_LEFT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef AV_CH_FRONT_RIGHT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_CH_FRONT_RIGHT CH_FRONT_RIGHT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef AV_CH_FRONT_CENTER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_CH_FRONT_CENTER CH_FRONT_CENTER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef AV_CH_LOW_FREQUENCY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_CH_LOW_FREQUENCY CH_LOW_FREQUENCY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef AV_CH_BACK_LEFT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_CH_BACK_LEFT CH_BACK_LEFT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef AV_CH_BACK_RIGHT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_CH_BACK_RIGHT CH_BACK_RIGHT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef AV_CH_FRONT_LEFT_OF_CENTER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_CH_FRONT_LEFT_OF_CENTER CH_FRONT_LEFT_OF_CENTER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef AV_CH_FRONT_RIGHT_OF_CENTER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_CH_FRONT_RIGHT_OF_CENTER CH_FRONT_RIGHT_OF_CENTER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef AV_CODEC_FLAG_OUTPUT_CORRUPT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define AV_CODEC_FLAG_OUTPUT_CORRUPT CODEC_FLAG_OUTPUT_CORRUPT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef AV_CH_BACK_CENTER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_CH_BACK_CENTER CH_BACK_CENTER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef AV_CODEC_FLAG_GRAY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define AV_CODEC_FLAG_GRAY CODEC_FLAG_GRAY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef AV_CH_SIDE_LEFT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_CH_SIDE_LEFT CH_SIDE_LEFT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef AV_CODEC_FLAG_DR1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define AV_CODEC_FLAG_DR1 CODEC_FLAG_DR1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef AV_CH_SIDE_RIGHT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_CH_SIDE_RIGHT CH_SIDE_RIGHT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef AV_CODEC_FLAG_DELAY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define AV_CODEC_FLAG_DELAY CODEC_FLAG_DELAY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef AV_CH_TOP_CENTER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_CH_TOP_CENTER CH_TOP_CENTER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef AV_CODEC_FLAG2_FAST
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define AV_CODEC_FLAG2_FAST CODEC_FLAG2_FAST
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef AV_CH_TOP_FRONT_LEFT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_CH_TOP_FRONT_LEFT CH_TOP_FRONT_LEFT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef FF_INPUT_BUFFER_PADDING_SIZE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define FF_INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_PADDING_SIZE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef AV_CH_TOP_FRONT_CENTER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_CH_TOP_FRONT_CENTER CH_TOP_FRONT_CENTER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef AV_CODEC_FLAG_INTERLACED_DCT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define AV_CODEC_FLAG_INTERLACED_DCT CODEC_FLAG_INTERLACED_DCT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef AV_CH_TOP_FRONT_RIGHT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_CH_TOP_FRONT_RIGHT CH_TOP_FRONT_RIGHT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef AV_CODEC_FLAG_INTERLACED_ME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define AV_CODEC_FLAG_INTERLACED_ME CODEC_FLAG_INTERLACED_ME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef AV_CH_TOP_BACK_LEFT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_CH_TOP_BACK_LEFT CH_TOP_BACK_LEFT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef AV_CODEC_FLAG_GLOBAL_HEADER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef AV_CH_TOP_BACK_CENTER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_CH_TOP_BACK_CENTER CH_TOP_BACK_CENTER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef AV_CODEC_FLAG_LOW_DELAY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define AV_CODEC_FLAG_LOW_DELAY CODEC_FLAG_LOW_DELAY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef AV_CH_TOP_BACK_RIGHT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_CH_TOP_BACK_RIGHT CH_TOP_BACK_RIGHT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef AV_CODEC_CAP_SMALL_LAST_FRAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define AV_CODEC_CAP_SMALL_LAST_FRAME CODEC_CAP_SMALL_LAST_FRAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef AV_CH_STEREO_LEFT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_CH_STEREO_LEFT CH_STEREO_LEFT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef AV_INPUT_BUFFER_MIN_SIZE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define AV_INPUT_BUFFER_MIN_SIZE FF_MIN_BUFFER_SIZE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef AV_CH_STEREO_RIGHT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_CH_STEREO_RIGHT CH_STEREO_RIGHT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* LIBAVCODEC_VERSION_MAJOR < 54 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !LIBAVCODEC_VERSION_CHECK(54, 25, 0, 51, 100)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define AVCodecID CodecID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-enum {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_NONE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* video codecs */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MPEG1VIDEO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MPEG2VIDEO_XVMC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_H261,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_H263,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_RV10,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_RV20,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MJPEG,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MJPEGB,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_LJPEG,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_SP5X,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_JPEGLS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MPEG4,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_RAWVIDEO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MSMPEG4V1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MSMPEG4V2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MSMPEG4V3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_WMV1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_WMV2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_H263P,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_H263I,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_FLV1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_SVQ1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_SVQ3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_DVVIDEO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_HUFFYUV,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_CYUV,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_H264,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_INDEO3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_VP3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_THEORA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ASV1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ASV2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_FFV1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_4XM,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_VCR1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_CLJR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MDEC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ROQ,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_INTERPLAY_VIDEO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_XAN_WC3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_XAN_WC4,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_RPZA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_CINEPAK,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_WS_VQA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MSRLE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MSVIDEO1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_IDCIN,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_8BPS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_SMC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_FLIC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_TRUEMOTION1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_VMDVIDEO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MSZH,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ZLIB,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_QTRLE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_SNOW,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_TSCC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ULTI,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_QDRAW,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_VIXL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_QPEG,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PNG,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PPM,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PBM,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PGM,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PGMYUV,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PAM,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_FFVHUFF,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_RV30,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_RV40,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_VC1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_WMV3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_LOCO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_WNV1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_AASC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_INDEO2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_FRAPS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_TRUEMOTION2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_BMP,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_CSCD,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MMVIDEO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ZMBV,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_AVS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_SMACKVIDEO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_NUV,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_KMVC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_FLASHSV,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_CAVS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_JPEG2000,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_VMNC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_VP5,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_VP6,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_VP6F,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_TARGA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_DSICINVIDEO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_TIERTEXSEQVIDEO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_TIFF,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_GIF,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if LIBAVCODEC_VERSION_MAJOR == 53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_FFH264,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_DXA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_DNXHD,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_THP,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_SGI,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_C93,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_BETHSOFTVID,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PTX,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_TXD,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_VP6A,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_AMV,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_VB,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCX,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_SUNRAST,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_INDEO4,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_INDEO5,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MIMIC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_RL2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if LIBAVCODEC_VERSION_MAJOR == 53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_8SVX_EXP,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_8SVX_FIB,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ESCAPE124,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_DIRAC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_BFI,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_CMV,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MOTIONPIXELS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_TGV,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_TGQ,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_TQI,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_AURA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_AURA2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_V210X,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_TMV,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_V210,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_DPX,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MAD,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_FRWU,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_FLASHSV2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_CDGRAPHICS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_R210,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ANM,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_BINKVIDEO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_IFF_ILBM,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_IFF_BYTERUN1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_KGV1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_YOP,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_VP8,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PICTOR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ANSI,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_A64_MULTI,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_A64_MULTI5,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_R10K,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MXPEG,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_LAGARITH,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PRORES,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_JV,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_DFA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_WMV3IMAGE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_VC1IMAGE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if LIBAVCODEC_VERSION_MAJOR == 53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_G723_1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_G729,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_UTVIDEO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_BMV_VIDEO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_VBLE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_DXTORY,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_V410,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_XWD,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_CDXL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_XBM,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ZEROCODEC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MSS1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MSA1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_TSCC2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MTS2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_CLLC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* various PAV_CM "codecs" */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_S16LE = 0x10000,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_S16BE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_U16LE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_U16BE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_S8,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_U8,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_MULAW,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_ALAW,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_S32LE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_S32BE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_U32LE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_U32BE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_S24LE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_S24BE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_U24LE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_U24BE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_S24DAUD,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_ZORK,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_S16LE_PLANAR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_DVD,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_F32BE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_F32LE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_F64BE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_F64LE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_BLURAY,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_LXF,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_S302M,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PCM_S8_PLANAR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* various ADPAV_CM codecs */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_IMA_WAV,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_IMA_DK3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_IMA_DK4,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_IMA_WS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_IMA_SMJPEG,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_MS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_4XM,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_XA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_ADX,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_EA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_G726,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_CT,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_SWF,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_YAMAHA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_SBPRO_4,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_SBPRO_3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_SBPRO_2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_THP,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_IMA_AMV,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_EA_R1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_EA_R3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_EA_R2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_IMA_EA_SEAD,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_IMA_EA_EACS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_EA_XAS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_EA_MAXIS_XA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_IMA_ISS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_G722,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ADPCM_IMA_APC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* AMR */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_AMR_NB = 0x12000,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_AMR_WB,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* RealAudio codecs*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_RA_144 = 0x13000,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_RA_288,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* various DPAV_CM codecs */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ROQ_DPCM = 0x14000,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_INTERPLAY_DPCM,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_XAN_DPCM,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_SOL_DPCM,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* audio codecs */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MP2 = 0x15000,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_AAC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_AC3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_DTS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_VORBIS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_DVAUDIO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_WMAV1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_WMAV2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MACE3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MACE6,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_VMDAUDIO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if LIBAVCODEC_VERSION_MAJOR == 53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_SONIC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_SONIC_LS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_FLAC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MP3ADU,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MP3ON4,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_SHORTEN,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ALAC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_WESTWOOD_SND1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_GSM, ///< as in Berlin toast format
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_QDM2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_COOK,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_TRUESPEECH,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_TTA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_SMACKAUDIO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_QCELP,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_WAVPACK,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_DSICINAUDIO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_IMC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MUSEPACK7,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MLP,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_GSM_MS, /* as found in WAV */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ATRAC3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if LIBAVCODEC_VERSION_MAJOR < 56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_VOXWARE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_APE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_NELLYMOSER,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MUSEPACK8,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_SPEEX,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_WMAVOICE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_WMAPRO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_WMALOSSLESS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ATRAC3P,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_EAC3,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_SIPR,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MP1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_TWINVQ,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_TRUEHD,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MP4ALS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ATRAC1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_BINKAUDIO_RDFT,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_BINKAUDIO_DCT,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_AAC_LATM,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_QDMC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_CELT,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if LIBAVCODEC_VERSION_MAJOR > 53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_G723_1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_G729,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_8SVX_EXP,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_8SVX_FIB,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_BMV_AUDIO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_RALF,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_IAC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_ILBC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* subtitle codecs */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_DVD_SUBTITLE = 0x17000,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_DVB_SUBTITLE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_TEXT, ///< raw UTF-8 text
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_XSUB,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_SSA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MOV_TEXT,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_HDMV_PGS_SUBTITLE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_DVB_TELETEXT,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_SRT,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* other specific kind of codecs (generally used for attachments) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_TTF = 0x18000,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * stream (only used by libavformat) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * stream (only used by libavformat) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AV_CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* LIBAVCODEC_VERSION < 54.25 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if LIBAVCODEC_VERSION_MAJOR < 54
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define avcodec_alloc_context3(a) avcodec_alloc_context()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define avcodec_open2(a, b, c) avcodec_open(a, b)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define err_recognition error_recognition
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef FF_MAX_B_FRAMES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define FF_MAX_B_FRAMES 16 // FIXME: remove this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* HAVE_LIBAVCODEC_AVCODEC_H */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -492,18 +91,10 @@ enum {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ( (LIBAVUTIL_VERSION_MICRO < 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if LIBAVUTIL_VERSION_MAJOR < 52 && !defined(AV_CPU_FLAG_MMXEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define AV_CPU_FLAG_MMXEXT AV_CPU_FLAG_MMX2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !LIBAVUTIL_VERSION_CHECK( 52, 11, 0, 32, 100 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define AV_PIX_FMT_FLAG_HWACCEL PIX_FMT_HWACCEL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !LIBAVUTIL_VERSION_CHECK( 51, 44, 0, 76, 100 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define av_pix_fmt_desc_get(a) &av_pix_fmt_descriptors[a]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* HAVE_LIBAVUTIL_AVUTIL_H */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if LIBAVUTIL_VERSION_MAJOR >= 55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/codec/avcodec/encoder.c modules/codec/avcodec/encoder.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9020576e0c0b3533c9d9760c3474941c43a6bd0c..d7d45e7183f1bf393df77cda972ee1fba6a59566 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/codec/avcodec/encoder.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/codec/avcodec/encoder.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -284,6 +284,24 @@ static void probe_video_frame_rate( encoder_t *p_enc, AVCodecContext *p_context,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ msg_Dbg( p_enc, "Time base set to %d/%d", p_context->time_base.num, p_context->time_base.den );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static void add_av_option_int( encoder_t *p_enc, AVDictionary** pp_dict, const char* psz_name, int i_value )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char buff[32];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( snprintf( buff, sizeof(buff), "%d", i_value ) < 0 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if( av_dict_set( pp_dict, psz_name, buff, 0 ) < 0 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ msg_Warn( p_enc, "Failed to set encoder option %s", psz_name );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static void add_av_option_float( encoder_t *p_enc, AVDictionary** pp_dict, const char* psz_name, float f_value )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char buff[128];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( snprintf( buff, sizeof(buff), "%f", f_value ) < 0 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if( av_dict_set( pp_dict, psz_name, buff, 0 ) < 0 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ msg_Warn( p_enc, "Failed to set encoder option %s", psz_name );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int OpenEncoder( vlc_object_t *p_this )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ encoder_t *p_enc = (encoder_t *)p_this;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -493,6 +511,8 @@ int OpenEncoder( vlc_object_t *p_this )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free( psz_val );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AVDictionary *options = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( p_enc->fmt_in.i_cat == VIDEO_ES )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( !p_enc->fmt_in.video.i_visible_width || !p_enc->fmt_in.video.i_visible_height )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -521,7 +541,7 @@ int OpenEncoder( vlc_object_t *p_this )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_context->lumi_masking = p_sys->f_lumi_masking;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_context->dark_masking = p_sys->f_dark_masking;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_context->p_masking = p_sys->f_p_masking;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_context->border_masking = p_sys->f_border_masking;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_av_option_float( p_enc, &options, "border_mask", p_sys->f_border_masking );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (LIBAVCODEC_VERSION_MAJOR < 55)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_context->luma_elim_threshold = p_sys->i_luma_elim;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_context->chroma_elim_threshold = p_sys->i_chroma_elim;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -535,7 +555,7 @@ int OpenEncoder( vlc_object_t *p_this )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( !p_context->max_b_frames &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ( p_enc->fmt_out.i_codec == VLC_CODEC_MPGV ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_enc->fmt_out.i_codec == VLC_CODEC_MP2V ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_context->flags |= CODEC_FLAG_LOW_DELAY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_context->flags |= AV_CODEC_FLAG_LOW_DELAY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ av_reduce( &p_context->sample_aspect_ratio.num,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &p_context->sample_aspect_ratio.den,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -593,16 +613,16 @@ int OpenEncoder( vlc_object_t *p_this )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_context->flags |= CODEC_FLAG_INTERLACED_DCT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_context->flags |= AV_CODEC_FLAG_INTERLACED_DCT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( p_sys->b_interlace_me )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_context->flags |= CODEC_FLAG_INTERLACED_ME;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_context->flags |= AV_CODEC_FLAG_INTERLACED_ME;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_context->trellis = p_sys->b_trellis;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( p_sys->i_qmin > 0 && p_sys->i_qmin == p_sys->i_qmax )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_context->flags |= CODEC_FLAG_QSCALE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_context->flags |= AV_CODEC_FLAG_QSCALE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* These codecs cause libavcodec to exit if thread_count is > 1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ See libavcodec/mpegvideo_enc.c:MPV_encode_init and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libavcodec/svq3.c , WMV2 calls MPV_encode_init also.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -638,12 +658,14 @@ int OpenEncoder( vlc_object_t *p_this )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( p_sys->i_qmin > 0 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_context->qmin = p_sys->i_qmin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_context->mb_lmin = p_context->lmin = p_sys->i_qmin * FF_QP2LAMBDA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_context->mb_lmin = p_sys->i_qmin * FF_QP2LAMBDA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_av_option_int( p_enc, &options, "lmin", p_context->mb_lmin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( p_sys->i_qmax > 0 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_context->qmax = p_sys->i_qmax;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_context->mb_lmax = p_context->lmax = p_sys->i_qmax * FF_QP2LAMBDA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_context->mb_lmax = p_sys->i_qmax * FF_QP2LAMBDA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_av_option_int( p_enc, &options, "lmax", p_context->mb_lmax);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_context->max_qdiff = 3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -651,12 +673,12 @@ int OpenEncoder( vlc_object_t *p_this )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( p_sys->i_quality && !p_enc->fmt_out.i_bitrate )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_context->flags |= CODEC_FLAG_QSCALE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_context->flags |= AV_CODEC_FLAG_QSCALE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_context->global_quality = p_sys->i_quality;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_context->rc_qsquish = 1.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ av_dict_set(&options, "qsquish", "1.0", 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Default to 1/2 second buffer for given bitrate unless defined otherwise*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( !p_sys->i_rc_buffer_size )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -670,7 +692,7 @@ int OpenEncoder( vlc_object_t *p_this )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* This is from ffmpeg's ffmpeg.c : */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_context->rc_initial_buffer_occupancy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ = p_sys->i_rc_buffer_size * 3/4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_context->rc_buffer_aggressivity = p_sys->f_rc_buffer_aggressivity;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_av_option_float( p_enc, &options, "rc_buffer_aggressivity", p_sys->f_rc_buffer_aggressivity );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if( p_enc->fmt_in.i_cat == AUDIO_ES )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -807,20 +829,23 @@ int OpenEncoder( vlc_object_t *p_this )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( !var_GetInteger( p_enc, ENC_CFG_PREFIX "qmin" ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_context->qmin = 10;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_context->mb_lmin = p_context->lmin = 10 * FF_QP2LAMBDA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_context->mb_lmin = 10 * FF_QP2LAMBDA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_av_option_int( p_enc, &options, "lmin", p_context->mb_lmin );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( !var_GetInteger( p_enc, ENC_CFG_PREFIX "qmax" ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_context->qmax = 42;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_context->mb_lmax = p_context->lmax = 42 * FF_QP2LAMBDA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_context->mb_lmax = 42 * FF_QP2LAMBDA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_av_option_int( p_enc, &options, "lmax", p_context->mb_lmax );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( !var_GetInteger( p_enc, ENC_CFG_PREFIX "qmin" ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_context->qmin = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_context->mb_lmin = p_context->lmin = FF_QP2LAMBDA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_context->mb_lmin = FF_QP2LAMBDA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_av_option_int( p_enc, &options, "lmin", p_context->mb_lmin );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -845,7 +870,7 @@ int OpenEncoder( vlc_object_t *p_this )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Make sure we get extradata filled by the encoder */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_context->extradata_size = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_context->extradata = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_context->flags |= CODEC_FLAG_GLOBAL_HEADER;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( p_enc->i_threads >= 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_context->thread_count = p_enc->i_threads;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -854,10 +879,10 @@ int OpenEncoder( vlc_object_t *p_this )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *psz_opts = var_InheritString(p_enc, ENC_CFG_PREFIX "options");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AVDictionary *options = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (psz_opts && *psz_opts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- options = vlc_av_get_options(psz_opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- free(psz_opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (psz_opts) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vlc_av_get_options_ng(psz_opts, options);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ free(psz_opts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vlc_avcodec_lock();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret = avcodec_open2( p_context, p_codec, options ? &options : NULL );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -982,7 +1007,7 @@ errmsg:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_context->flags &= ~CODEC_FLAG_GLOBAL_HEADER;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_context->flags &= ~AV_CODEC_FLAG_GLOBAL_HEADER;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( p_enc->fmt_in.i_cat == AUDIO_ES )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -992,7 +1017,7 @@ errmsg:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->i_sample_bytes = (p_enc->fmt_in.audio.i_bitspersample / 8);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->i_frame_size = p_context->frame_size > 1 ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_context->frame_size :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FF_MIN_BUFFER_SIZE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AV_INPUT_BUFFER_MIN_SIZE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->i_buffer_out = av_samples_get_buffer_size(NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->p_context->channels, p_sys->i_frame_size,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->p_context->sample_fmt, DEFAULT_ALIGN);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1359,7 +1384,7 @@ static block_t *handle_delay_buffer( encoder_t *p_enc, encoder_sys_t *p_sys, int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(unlikely( ( (leftover + buffer_delay) < p_sys->i_buffer_out ) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- !(p_sys->p_codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME )))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ !(p_sys->p_codec->capabilities & AV_CODEC_CAP_SMALL_LAST_FRAME )))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ msg_Dbg( p_enc, "No small last frame support, padding");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t padding_size = p_sys->i_buffer_out - (leftover+buffer_delay);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/codec/avcodec/video.c modules/codec/avcodec/video.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a720fd80f1369a06776a13cac591a0002da1f37c..f0e0c8e90786da47aaa12102dc9ec4aeacf3f010 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/codec/avcodec/video.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/codec/avcodec/video.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -251,11 +251,11 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ var_InheritInteger( p_dec, "avcodec-error-resilience" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( var_CreateGetBool( p_dec, "grayscale" ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_sys->p_context->flags |= CODEC_FLAG_GRAY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_sys->p_context->flags |= AV_CODEC_FLAG_GRAY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* ***** Output always the frames ***** */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if LIBAVCODEC_VERSION_CHECK(55, 23, 1, 40, 101)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_sys->p_context->flags |= CODEC_FLAG_OUTPUT_CORRUPT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_sys->p_context->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i_val = var_CreateGetInteger( p_dec, "avcodec-vismv" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -268,7 +268,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if( i_val == 1 ) p_sys->p_context->skip_loop_filter = AVDISCARD_NONREF;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( var_CreateGetBool( p_dec, "avcodec-fast" ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_sys->p_context->flags2 |= CODEC_FLAG2_FAST;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_sys->p_context->flags2 |= AV_CODEC_FLAG2_FAST;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* ***** libavcodec frame skipping ***** */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->b_hurry_up = var_CreateGetBool( p_dec, "avcodec-hurry-up" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -295,7 +295,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->b_direct_rendering = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->i_direct_rendering_used = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( var_CreateGetBool( p_dec, "avcodec-dr" ) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (p_sys->p_codec->capabilities & CODEC_CAP_DR1) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (p_sys->p_codec->capabilities & AV_CODEC_CAP_DR1) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* No idea why ... but this fixes flickering on some TSCC streams */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->i_codec_id != AV_CODEC_ID_TSCC && p_sys->i_codec_id != AV_CODEC_ID_CSCD &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->i_codec_id != AV_CODEC_ID_CINEPAK &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -306,6 +306,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->b_direct_rendering = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef CODEC_FLAG_EMU_EDGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* libavcodec doesn't properly release old pictures when frames are skipped */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //if( p_sys->b_hurry_up ) p_sys->b_direct_rendering = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( p_sys->b_direct_rendering )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -317,6 +318,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ msg_Dbg( p_dec, "direct rendering is disabled" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->p_context->get_format = ffmpeg_GetFormat;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Always use our get_buffer wrapper so we can calculate the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -427,7 +429,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( p_dec->fmt_out.video.p_palette )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *p_dec->fmt_out.video.p_palette = *p_dec->fmt_in.video.p_palette;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else if( p_sys->i_codec_id != CODEC_ID_MSVIDEO1 && p_sys->i_codec_id != CODEC_ID_CINEPAK )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if( p_sys->i_codec_id != AV_CODEC_ID_MSVIDEO1 && p_sys->i_codec_id != AV_CODEC_ID_CINEPAK )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->p_context->palctrl = &p_sys->palette;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -484,7 +486,7 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_block = *pp_block;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(!p_block && !(p_sys->p_codec->capabilities & CODEC_CAP_DELAY) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(!p_block && !(p_sys->p_codec->capabilities & AV_CODEC_CAP_DELAY) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( p_sys->b_delayed_open )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -594,13 +596,13 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->b_flush = ( p_block->i_flags & BLOCK_FLAG_END_OF_SEQUENCE ) != 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_block = block_Realloc( p_block, 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_block->i_buffer + FF_INPUT_BUFFER_PADDING_SIZE );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_block->i_buffer + AV_INPUT_BUFFER_PADDING_SIZE );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( !p_block )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p_block->i_buffer -= FF_INPUT_BUFFER_PADDING_SIZE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ p_block->i_buffer -= AV_INPUT_BUFFER_PADDING_SIZE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *pp_block = p_block;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memset( p_block->p_buffer + p_block->i_buffer, 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FF_INPUT_BUFFER_PADDING_SIZE );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AV_INPUT_BUFFER_PADDING_SIZE );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while( !p_block || p_block->i_buffer > 0 || p_sys->b_flush )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -621,7 +623,7 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Return delayed frames if codec has CODEC_CAP_DELAY */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Return delayed frames if codec has AV_CODEC_CAP_DELAY */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkt.data = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkt.size = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -711,8 +713,15 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Compute the PTS */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef FF_API_PKT_PTS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mtime_t i_pts = p_sys->p_ff_pic->pts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (i_pts == AV_NOPTS_VALUE )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ i_pts = p_sys->p_ff_pic->pkt_dts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mtime_t i_pts =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->p_ff_pic->pkt_pts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (i_pts <= VLC_TS_INVALID)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i_pts = p_sys->p_ff_pic->pkt_dts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -874,7 +883,7 @@ static void ffmpeg_InitCodec( decoder_t *p_dec )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->p_context->extradata_size = i_size + 12;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p = p_sys->p_context->extradata =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ av_malloc( p_sys->p_context->extradata_size +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FF_INPUT_BUFFER_PADDING_SIZE );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AV_INPUT_BUFFER_PADDING_SIZE );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( !p )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -911,13 +920,13 @@ static void ffmpeg_InitCodec( decoder_t *p_dec )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->p_context->extradata_size = i_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_sys->p_context->extradata =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- av_malloc( i_size + FF_INPUT_BUFFER_PADDING_SIZE );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ av_malloc( i_size + AV_INPUT_BUFFER_PADDING_SIZE );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( p_sys->p_context->extradata )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy( p_sys->p_context->extradata,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_dec->fmt_in.p_extra, i_size );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memset( p_sys->p_context->extradata + i_size,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 0, FF_INPUT_BUFFER_PADDING_SIZE );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 0, AV_INPUT_BUFFER_PADDING_SIZE );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-ffmpegVLC.diff b/multimedia/VLC/files/patch-ffmpegVLC.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c005003..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-ffmpegVLC.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,82 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig.configure.ac 2016-05-31 18:11:07.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2016-07-04 23:04:07.557682616 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2283,7 +2272,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_CONDITIONAL([MERGE_FFMPEG], [test "$enable_merge_ffmpeg" != "no"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_CHECKING([for libavutil variant])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PKG_CHECK_EXISTS([libavutil], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PKG_CHECK_EXISTS([libavutil-VLC], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libavutil_version="$(${PKG_CONFIG} --modversion libavutil)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libavutil_micro="${libavutil_version##*.}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS_IF([test ${libavutil_micro} -le 99], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2322,8 +2311,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_ARG_ENABLE(avcodec,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ --enable-avcodec libavcodec codec (default enabled)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS_IF([test "${enable_avcodec}" != "no"], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_EXISTS([libavutil < 55],, [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_MODULES(AVCODEC,[libavcodec-VLC >= 53.34.0 libavutil-VLC >= 51.22.0], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_EXISTS([libavutil-VLC < 55],, [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_ERROR([libavutil versions 55 and later are not supported.])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VLC_SAVE_FLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2382,7 +2371,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "${avfork}" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ffmpeg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_EXISTS([libavcodec-VLC >= 57.10.100], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2416,7 +2405,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS_IF([test "x${have_avcodec}" = "xyes"], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "${avfork}" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ffmpeg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_EXISTS([libavcodec-VLC >= 57.10.100], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2496,7 +2485,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_avformat="no"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS_IF([test "${enable_avformat}" != "no"], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_MODULES(AVFORMAT,[libavformat >= 53.21.0 libavcodec libavutil], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_MODULES(AVFORMAT,[libavformat-VLC >= 53.21.0 libavcodec-VLC libavutil-VLC], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_avformat="yes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VLC_SAVE_FLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="${CPPFLAGS} ${AVFORMAT_CFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2523,7 +2512,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (default enabled)]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${enable_swscale}" != "no"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_MODULES(SWSCALE,[libswscale],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_MODULES(SWSCALE,[libswscale-VLC],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VLC_SAVE_FLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="${CPPFLAGS} ${SWSCALE_CFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2550,7 +2539,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ --enable-postproc libpostproc image post-processing (default auto)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${enable_postproc}" != "no"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_MODULES(POSTPROC,[libpostproc libavutil],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_MODULES(POSTPROC,[libpostproc-VLC libavutil-VLC],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VLC_SAVE_FLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3180,12 +3169,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "${avfork}" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libav) av_vdpau_ver="55.26.0" ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ffmpeg) av_vdpau_ver="55.42.100"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_EXISTS([libavcodec-VLC >= 57.10.100], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_EXISTS([libavutil >= 52.4.0 libavcodec >= ${av_vdpau_ver}], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_EXISTS([libavutil-VLC >= 52.4.0 libavcodec-VLC >= ${av_vdpau_ver}], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_avcodec_vdpau="yes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_NOTICE([VDPAU decoding acceleration activated])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ], [
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-for-lua52.diff b/multimedia/VLC/files/patch-for-lua52.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 01a839f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-for-lua52.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,50 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 95f24fc..15c274b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1481,7 +1481,7 @@ AC_ARG_ENABLE(lua,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [disable LUA scripting support (default enabled)])])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${enable_lua}" != "no"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_MODULES(LUA, lua5.2,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_MODULES(LUA, lua-5.2,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ have_lua=yes ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua 5.1 instead])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1498,8 +1498,8 @@ then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ have_lua=no ] )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_CHECK_LIB( lua5.2 , luaL_newstate,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [LUA_LIBS="-llua5.2"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CHECK_LIB( lua-5.2 , luaL_newstate,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [LUA_LIBS="-llua-5.2"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_LIB( lua5.1 , luaL_newstate,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [LUA_LIBS="-llua5.1"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_LIB( lua51 , luaL_newstate,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1516,7 +1516,7 @@ then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_ARG_VAR([LUAC], [LUA byte compiler])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_PATH_PROGS(LUAC,[${LUAC} luac], [false])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_PATH_PROGS(LUAC,[${LUAC} luac5.2], [false])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS_IF([test "${LUAC}" = "false"], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_ERROR([Could not find the LUA byte compiler.])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/lua/vlc.h modules/lua/vlc.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c7a2913..b5ebbd8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/lua/vlc.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/lua/vlc.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,9 +39,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <vlc_demux.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define LUA_COMPAT_MODULE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <lua.h> /* Low level lua C API */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <lauxlib.h> /* Higher level C API */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <lualib.h> /* Lua libs */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <lua-5.2/lua.h> /* Low level lua C API */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <lua-5.2/lauxlib.h> /* Higher level C API */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <lua-5.2/lualib.h> /* Lua libs */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if LUA_VERSION_NUM >= 502
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define lua_equal(L,idx1,idx2) lua_compare(L,(idx1),(idx2),LUA_OPEQ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define lua_objlen(L,idx) lua_rawlen(L,idx)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-for-lua53.diff b/multimedia/VLC/files/patch-for-lua53.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3ce45d8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/files/patch-for-lua53.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,272 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/lua/demux.c modules/lua/demux.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b732eebd927ebc6f1153ab092066c87fed812078..dea68fae3756f3dc7ffdf75af87b4f201e2d8dfe 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/lua/demux.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/lua/demux.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,7 +52,7 @@ struct demux_sys_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int vlclua_demux_peek( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ demux_t *p_demux = (demux_t *)vlclua_get_this( L );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int n = luaL_checkint( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int n = luaL_checkinteger( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const uint8_t *p_peek;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i_peek = stream_Peek( p_demux->s, &p_peek, n );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,7 +67,7 @@ static int vlclua_demux_read( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ demux_t *p_demux = (demux_t *)vlclua_get_this( L );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const uint8_t *p_read;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int n = luaL_checkint( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int n = luaL_checkinteger( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i_read = stream_Peek( p_demux->s, &p_read, n );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( i_read > 0 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/lua/libs/configuration.c modules/lua/libs/configuration.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7394e52790373d66afb191785b1505b1b9df9d15..41d0a20c4a12ce1ebec1ee9146235987550526f7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/lua/libs/configuration.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/lua/libs/configuration.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -84,7 +84,7 @@ static int vlclua_config_set( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case VLC_VAR_INTEGER:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- config_PutInt( p_this, psz_name, luaL_checkint( L, 2 ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ config_PutInt( p_this, psz_name, luaL_checkinteger( L, 2 ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case VLC_VAR_BOOL:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/lua/libs/net.c modules/lua/libs/net.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 92d7b586d6808db0640f60097c1fa70be3b5a6d8..2a5351071b4fa7937e9756bf2ed998ec2a830529 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/lua/libs/net.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/lua/libs/net.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -202,7 +202,7 @@ static int vlclua_net_listen_tcp( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vlc_object_t *p_this = vlclua_get_this( L );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *psz_host = luaL_checkstring( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i_port = luaL_checkint( L, 2 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int i_port = luaL_checkinteger( L, 2 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int *pi_fd = net_ListenTCP( p_this, psz_host, i_port );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( pi_fd == NULL )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return luaL_error( L, "Cannot listen on %s:%d", psz_host, i_port );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -274,7 +274,7 @@ static int vlclua_net_connect_tcp( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vlc_object_t *p_this = vlclua_get_this( L );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *psz_host = luaL_checkstring( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i_port = luaL_checkint( L, 2 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int i_port = luaL_checkinteger( L, 2 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i_fd = net_Connect( p_this, psz_host, i_port, SOCK_STREAM, IPPROTO_TCP );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lua_pushinteger( L, vlclua_fd_map_safe( L, i_fd ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -282,26 +282,26 @@ static int vlclua_net_connect_tcp( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int vlclua_net_close( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i_fd = luaL_checkint( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int i_fd = luaL_checkinteger( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vlclua_fd_unmap_safe( L, i_fd );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int vlclua_net_send( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t i_len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *psz_buffer = luaL_checklstring( L, 2, &i_len );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- i_len = luaL_optint( L, 3, i_len );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ i_len = luaL_optinteger( L, 3, i_len );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lua_pushinteger( L, (fd != -1) ? send( fd, psz_buffer, i_len, 0 ) : -1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int vlclua_net_recv( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- size_t i_len = luaL_optint( L, 2, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t i_len = luaL_optinteger( L, 2, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char psz_buffer[i_len];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ssize_t i_ret = (fd != -1) ? recv( fd, psz_buffer, i_len, 0 ) : -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -382,19 +382,19 @@ static int vlclua_fd_open( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef _WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int vlclua_fd_write( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t i_len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *psz_buffer = luaL_checklstring( L, 2, &i_len );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- i_len = luaL_optint( L, 3, i_len );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ i_len = luaL_optinteger( L, 3, i_len );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lua_pushinteger( L, (fd != -1) ? write( fd, psz_buffer, i_len ) : -1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int vlclua_fd_read( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- size_t i_len = luaL_optint( L, 2, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t i_len = luaL_optinteger( L, 2, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char psz_buffer[i_len];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ssize_t i_ret = (fd != -1) ? read( fd, psz_buffer, i_len ) : -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/lua/libs/osd.c modules/lua/libs/osd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 341cd62d03a7d0f605dd1312197253a72be75608..799b1f6b45455eae888dcc29933a0c4497f1daf4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/lua/libs/osd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/lua/libs/osd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,7 +67,7 @@ static int vlclua_osd_icon( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *psz_icon = luaL_checkstring( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i_icon = vlc_osd_icon_from_string( psz_icon );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i_chan = luaL_optint( L, 2, SPU_DEFAULT_CHANNEL );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int i_chan = luaL_optinteger( L, 2, SPU_DEFAULT_CHANNEL );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( !i_icon )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return luaL_error( L, "\"%s\" is not a valid osd icon.", psz_icon );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,9 +114,9 @@ static int vlc_osd_position_from_string( const char *psz_name )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int vlclua_osd_message( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *psz_message = luaL_checkstring( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i_chan = luaL_optint( L, 2, SPU_DEFAULT_CHANNEL );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int i_chan = luaL_optinteger( L, 2, SPU_DEFAULT_CHANNEL );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *psz_position = luaL_optstring( L, 3, "top-right" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mtime_t duration = luaL_optint( L, 4, 1000000 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mtime_t duration = luaL_optinteger( L, 4, 1000000 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ input_thread_t *p_input = vlclua_get_input_internal( L );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( p_input )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -154,10 +154,10 @@ static int vlc_osd_slider_type_from_string( const char *psz_name )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int vlclua_osd_slider( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i_position = luaL_checkint( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int i_position = luaL_checkinteger( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *psz_type = luaL_checkstring( L, 2 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i_type = vlc_osd_slider_type_from_string( psz_type );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i_chan = luaL_optint( L, 3, SPU_DEFAULT_CHANNEL );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int i_chan = luaL_optinteger( L, 3, SPU_DEFAULT_CHANNEL );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( !i_type )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return luaL_error( L, "\"%s\" is not a valid slider type.",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ psz_type );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -198,7 +198,7 @@ static int vlclua_spu_channel_register( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int vlclua_spu_channel_clear( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i_chan = luaL_checkint( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int i_chan = luaL_checkinteger( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ input_thread_t *p_input = vlclua_get_input_internal( L );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( !p_input )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return luaL_error( L, "Unable to find input." );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/lua/libs/playlist.c modules/lua/libs/playlist.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cdfd9509b8d6e8fc634d98583e49b0232a34c1ac..5838214523b88860e034340aef40229ac6302e97 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/lua/libs/playlist.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/lua/libs/playlist.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,7 +69,7 @@ static int vlclua_playlist_next( lua_State * L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int vlclua_playlist_skip( lua_State * L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i_skip = luaL_checkint( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int i_skip = luaL_checkinteger( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ playlist_t *p_playlist = vlclua_get_playlist_internal( L );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ playlist_Skip( p_playlist, i_skip );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -127,7 +127,7 @@ static int vlclua_playlist_random( lua_State * L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int vlclua_playlist_gotoitem( lua_State * L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i_id = luaL_checkint( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int i_id = luaL_checkinteger( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ playlist_t *p_playlist = vlclua_get_playlist_internal( L );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PL_LOCK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i_ret = playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -139,7 +139,7 @@ static int vlclua_playlist_gotoitem( lua_State * L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int vlclua_playlist_delete( lua_State * L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i_id = luaL_checkint( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int i_id = luaL_checkinteger( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ playlist_t *p_playlist = vlclua_get_playlist_internal( L );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PL_LOCK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -155,8 +155,8 @@ static int vlclua_playlist_delete( lua_State * L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int vlclua_playlist_move( lua_State * L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i_item = luaL_checkint( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i_target = luaL_checkint( L, 2 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int i_item = luaL_checkinteger( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int i_target = luaL_checkinteger( L, 2 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ playlist_t *p_playlist = vlclua_get_playlist_internal( L );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PL_LOCK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_item );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/lua/libs/stream.c modules/lua/libs/stream.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0f9ef8b866fbc7dc9e89c93c1e10d49998f6d864..330df464815384bb0d468b331d4405e02e1be868 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/lua/libs/stream.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/lua/libs/stream.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -101,7 +101,7 @@ static int vlclua_stream_read( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i_read;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stream_t **pp_stream = (stream_t **)luaL_checkudata( L, 1, "stream" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int n = luaL_checkint( L, 2 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int n = luaL_checkinteger( L, 2 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t *p_read = malloc( n );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( !p_read ) return vlclua_error( L );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/lua/libs/variables.c modules/lua/libs/variables.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7a106af5ec9624fe3148e3035eb238363a60431b..5c64dc5e114092efbee9b33f5065cf7699c98ae3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/lua/libs/variables.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/lua/libs/variables.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -103,7 +103,7 @@ static int vlclua_tovalue( lua_State *L, int i_type, vlc_value_t *val )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ val->b_bool = luaL_checkboolean( L, -1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case VLC_VAR_INTEGER:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- val->i_int = luaL_checkint( L, -1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ val->i_int = luaL_checkinteger( L, -1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case VLC_VAR_STRING:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ val->psz_string = (char*)luaL_checkstring( L, -1 ); /* XXX: Beware, this only stays valid as long as (L,-1) stays in the stack */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/lua/libs/volume.c modules/lua/libs/volume.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8e7a392e654054e267345468ef502cccdfddafdd..00fbcab15d21ee25453c516466f56e302aed49fe 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/lua/libs/volume.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/lua/libs/volume.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int vlclua_volume_set( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ playlist_t *p_this = vlclua_get_playlist_internal( L );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i_volume = luaL_checkint( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int i_volume = luaL_checkinteger( L, 1 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( i_volume < 0 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i_volume = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i_ret = playlist_VolumeSet( p_this, i_volume/(float)AOUT_VOLUME_DEFAULT );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,7 +68,7 @@ static int vlclua_volume_up( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ playlist_t *p_this = vlclua_get_playlist_internal( L );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ float volume;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- playlist_VolumeUp( p_this, luaL_optint( L, 1, 1 ), &volume );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ playlist_VolumeUp( p_this, luaL_optinteger( L, 1, 1 ), &volume );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lua_pushnumber( L, lroundf(volume * AOUT_VOLUME_DEFAULT) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,7 +78,7 @@ static int vlclua_volume_down( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ playlist_t *p_this = vlclua_get_playlist_internal( L );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ float volume;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- playlist_VolumeDown( p_this, luaL_optint( L, 1, 1 ), &volume );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ playlist_VolumeDown( p_this, luaL_optinteger( L, 1, 1 ), &volume );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lua_pushnumber( L, lroundf(volume * AOUT_VOLUME_DEFAULT) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/lua/libs/win.c modules/lua/libs/win.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 67f6b930d5fd69f141f295cb434d5ea7ef2ea619..24a84760a928befad091b14ec8508ab785583fc0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/lua/libs/win.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/lua/libs/win.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,7 +123,7 @@ static int vlclua_console_init( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int vlclua_console_wait( lua_State *L )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i_timeout = luaL_optint( L, 1, 0 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int i_timeout = luaL_optinteger( L, 1, 0 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DWORD status = WaitForSingleObject( GetConsole( L ), i_timeout );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lua_pushboolean( L, status == WAIT_OBJECT_0 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-simplepreferences.diff b/multimedia/VLC/files/patch-simplepreferences.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 62036a7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-simplepreferences.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/gui/qt4/components/simple_preferences.cpp modules/gui/qt4/components/simple_preferences.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2487cc4..cfe6a3b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/gui/qt4/components/simple_preferences.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/gui/qt4/components/simple_preferences.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -225,7 +225,7 @@ static int getDefaultAudioVolume(vlc_object_t *obj, const char *aout)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!strcmp("auhal") && module_exists("auhal"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!strcmp(aout, "auhal") && module_exists("auhal"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return (config_GetFloat(obj, "auhal-volume") * 100.f + .5f)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- / AOUT_VOLUME_DEFAULT;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-static_assert.diff b/multimedia/VLC/files/patch-static_assert.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f00a7df..cbe1c83 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-static_assert.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/files/patch-static_assert.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.h.orig 2016-03-22 15:34:33.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.h 2016-03-22 15:34:57.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -793,6 +793,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Define to `int' if <stddef.h> does not define. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* #undef ssize_t */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define static_assert _Static_assert
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <vlc_fixups.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git include/vlc_fixups.h include/vlc_fixups.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 997f600..d65f41c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/vlc_fixups.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/vlc_fixups.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -239,9 +239,9 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined (HAVE_STATIC_ASSERT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); }))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define static_assert _Static_assert
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined (HAVE_STATIC_ASSERT) && !defined (static_assert)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define _Static_assert(x, s) ((void) sizeof (struct { unsigned a[(x) ? 1 : -1];}))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Alignment of critical static data structures */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-vda-ffmpeg34.diff b/multimedia/VLC/files/patch-vda-ffmpeg34+.diff
</span>similarity index 100%
rename from multimedia/VLC/files/patch-vda-ffmpeg34.diff
rename to multimedia/VLC/files/patch-vda-ffmpeg34+.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-vlc-no-qt5.diff b/multimedia/VLC/files/patch-vlc-no-qt5.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7edf97c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-vlc-no-qt5.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a085ac3..8c6eb3d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3701,7 +3701,7 @@ AC_ARG_ENABLE(qt, [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS_IF([test "${enable_qt}" != "no"], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CHECK_MODULES([QT], [Qt5Core >= 6.1.0 Qt5Widgets Qt5Gui], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VLC_ADD_LIBS([qt4],[${QTX11_LIBS}])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11])
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-vlc-qt-configureac.diff b/multimedia/VLC/files/patch-vlc-qt-configureac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 824ac9a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-vlc-qt-configureac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a085ac3..f0b2c0a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -69,6 +69,7 @@ AM_PROG_CC_C_O
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_PROG_CXX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_PROG_CPP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_PROG_OBJC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_PROG_OBJCXX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _AM_DEPENDENCIES([OBJC])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_PROG_EGREP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_PROG_MAKE_SET
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/gui/qt4/Makefile.am modules/gui/qt4/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1a564cf..ff4ea4c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/gui/qt4/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/gui/qt4/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,6 +26,7 @@ libqt4_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIB) -lX11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if HAVE_DARWIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libqt4_plugin_la_OBJCXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) $(CXXFLAGS_qt4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libqt4_plugin_la_LDFLAGS += -Wl,-framework,Cocoa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -118,6 +119,9 @@ libqt4_plugin_la_SOURCES = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if HAVE_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libqt4_plugin_la_SOURCES += main_interface_win32.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if HAVE_DARWIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libqt4_plugin_la_SOURCES += util/searchlineedit_mac.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Meta-object compilation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-vlc-qt4mac.diff b/multimedia/VLC/files/patch-vlc-qt4mac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1e958f4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-vlc-qt4mac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,97 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/gui/qt4/util/searchlineedit.cpp modules/gui/qt4/util/searchlineedit.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 94744ec..e83625d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/gui/qt4/util/searchlineedit.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/gui/qt4/util/searchlineedit.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -103,7 +103,7 @@ void ClickLineEdit::focusOutEvent( QFocusEvent *ev )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef Q_OS_MAC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef Q_OS_MAC_UNUSED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SearchLineEdit::SearchLineEdit( QWidget *parent ) : QLineEdit( parent )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clearButton = new QFramelessButton( this );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -202,4 +202,14 @@ void SearchLineEdit::searchEditingFinished()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- emit searchDelayedChanged( text() );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// void SearchLineEdit::updateText( const QString& text )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// void SearchLineEdit::searchEditingFinished()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/gui/qt4/util/searchlineedit.hpp modules/gui/qt4/util/searchlineedit.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a09b9bc..8d9e2b7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/gui/qt4/util/searchlineedit.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/gui/qt4/util/searchlineedit.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,7 +72,7 @@ private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef Q_OS_MAC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef Q_OS_MAC_UNUSED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class QFramelessButton;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class SearchLineEdit : public QLineEdit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -99,28 +99,33 @@ private slots:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- signals:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void searchDelayedChanged( const QString& );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* On Mac, we try to use the native NSSearchField */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <QMacCocoaViewContainer>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--class SearchLineEdit : public QMacCocoaViewContainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Q_OBJECT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SearchLineEdit(QWidget *parent = 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- virtual ~SearchLineEdit() {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- virtual QSize sizeHint() const { return QSize(150, 40); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--public slots:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- void clear() {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--signals:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- void searchDelayedChanged( const QString& );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- void textEdited( const QString& );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// /* On Mac, we try to use the native NSSearchField */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// #include <QMacCocoaViewContainer>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// class SearchLineEdit : public QMacCocoaViewContainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Q_OBJECT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// SearchLineEdit(QWidget *parent = 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// virtual ~SearchLineEdit() {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// virtual QSize sizeHint() const { return QSize(150, 40); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// public slots:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// void clear() {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// // moc does not look at #ifdefs, so we must provide the same slots and signals
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// private slots:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// void updateText( const QString& );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// void searchEditingFinished();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// signals:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// void searchDelayedChanged( const QString& );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// void textEdited( const QString& );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/static_assert.patch b/multimedia/VLC/files/static_assert.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8e8a7ca..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/static_assert.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git include/vlc_fixups.h include/vlc_fixups.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b448d83..638b864 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/vlc_fixups.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/vlc_fixups.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -239,8 +239,8 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if !defined (HAVE_STATIC_ASSERT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); }))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined (HAVE_STATIC_ASSERT) && !defined (static_assert)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define _Static_assert(x, s) ((void) sizeof (struct { unsigned a[(x) ? 1 : -1];}))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define static_assert _Static_assert
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>