Request 2436 (accepted)

avidemux3.changes Changed

avidemux3.spec Changed

@@ -16,25 +16,31 @@
 #
 
 
-%define         ffmpeg_version 2.8.5
+%if 0%{?suse_version} > 1320 || 0%{?is_opensuse}
+%bcond_without  build_qt5
+%define         qtversion 5
+%else
+%define         qtversion 4
+%endif
+
+%define         ffmpeg_version 2.8.6
 
 Name:           avidemux3
 Summary:        Graphical video editing and transcoding tool
-Version:        2.6.10
+Version:        2.6.11
 Release:        1
 Url:            http://avidemux.sourceforge.net/
 Source0:        avidemux_%{version}.tar.gz
-Source1:        avidemux3-qt4.desktop
-Source2:        avidemux3-gtk.desktop
-Source3:        ffmpeg-%{ffmpeg_version}.tar.bz2
-Source4:        config.mak.diff
-Source5:        libavcodec_put_bits.h.patch
-Source6:        xvba_support_from_xbmc_xvba.patch
-Source7:        libavcodec_x86_fmtconvert_init.c.patch
-Source8:        libavcodec_mpegvideo_enc.c.patch
-Source9:        libavcodec_mpeg12enc.c.patch
-Source10:       libavcodec_avcodec.h.patch
-Source11:       libavcodec_nvenc.patch
+Source1:        avidemux3-qt.desktop
+Source2:        ffmpeg-%{ffmpeg_version}.tar.bz2
+Source3:        config.mak.diff
+Source4:        libavcodec_put_bits.h.patch
+Source5:        xvba_support_from_xbmc_xvba.patch
+Source6:        libavcodec_x86_fmtconvert_init.c.patch
+Source7:        libavcodec_mpegvideo_enc.c.patch
+Source8:        libavcodec_mpeg12enc.c.patch
+Source9:        libavcodec_avcodec.h.patch
+Source10:       libavcodec_nvenc.patch
 Patch0:         avidemux-cmake-2.8.8.patch
 Patch1:         avidemux-linking.patch
 Patch2:         avidemux-x264_plugins.patch
@@ -44,6 +50,7 @@
 Patch6:         avidemux-cpu_armel.patch
 Patch7:         avidemux-ADM_VERSION.patch
 Patch8:         avidemux-cmake-permissions.patch
+Patch9:         avidemux-find-lrelease-qt5.patch
 License:        GPL-2.0
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 
@@ -128,12 +135,17 @@
 %endif
 
 %if ! 0%{?sles_version}
+%if %{with build_qt5}
+# QT5-GUI
+BuildRequires:  cmake(Qt5Core)
+BuildRequires:  cmake(Qt5LinguistTools)
+BuildRequires:  cmake(Qt5OpenGL)
+BuildRequires:  cmake(Qt5Script)
+BuildRequires:  cmake(Qt5Widgets)
+%else
 # QT4-GUI
 BuildRequires:  pkgconfig(QtCore) >= 4.7
-
-# GTK-GUI
-BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(cairo)
+%endif
 %endif
 
 # Main package requires at least one frontend (cli, gtk or qt4)
@@ -171,35 +183,15 @@
 This package provides a command-line interface to editing videos with avidemux.
 
 %if ! 0%{?sles_version}
-%package gtk
-Summary:        GTK interface for avidemux
-Group:          Productivity/Multimedia/Video/Editors and Convertors
-Provides:       avidemux3-frontend = %{version}-%{release}
-Requires:       avidemux3 = %{version}-%{release}
-Requires:       avidemux3-help = %{version}-%{release}
-
-%description gtk
-Avidemux is a free video editor designed for simple cutting, filtering and
-encoding tasks. It supports many file types, including AVI, DVD compatible
-MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated
-using projects, job queue and powerful scripting capabilities.
-
-Avidemux is available for Linux, BSD, Mac OS X and Microsoft Windows under
-the GNU GPL license. The program was written from scratch by Mean, but code
-from other people and projects has been used as well. Patches, translations
-and even bug reports are always welcome.
-
-This package provides the GTK graphical interface for avidemux.
-
-%package qt4
+%package qt%{qtversion}
 Summary:        Qt interface for avidemux
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Provides:       avidemux3-frontend = %{version}-%{release}
 Requires:       avidemux3 = %{version}-%{release}
 Requires:       avidemux3-help = %{version}-%{release}
-Recommends:     avidemux3-qt4-lang = %{version}-%{release}
+Recommends:     avidemux3-qt%{qtversion}-lang = %{version}-%{release}
 
-%description qt4
+%description qt%{qtversion}
 Avidemux is a free video editor designed for simple cutting, filtering and
 encoding tasks. It supports many file types, including AVI, DVD compatible
 MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated
@@ -212,13 +204,13 @@
 
 This package contains the Qt graphical interface for avidemux.
 
-%package qt4-lang
-Summary:        Languages for package avidemux3-qt4
+%package qt%{qtversion}-lang
+Summary:        Languages for package avidemux3-qt%{qtversion}
 Group:          System/Localization
-Requires:       avidemux3-qt4 = %{version}-%{release}
+Requires:       avidemux3-qt%{qtversion} = %{version}-%{release}
 BuildArch:      noarch
 
-%description qt4-lang
+%description qt%{qtversion}-lang
 Avidemux is a free video editor designed for simple cutting, filtering and
 encoding tasks. It supports many file types, including AVI, DVD compatible
 MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated
@@ -229,7 +221,7 @@
 from other people and projects has been used as well. Patches, translations
 and even bug reports are always welcome.
 
-This package provides translations for package avidemux3-qt4.
+This package provides translations for package avidemux3-qt%{qtversion}.
 
 %package help
 Summary:        Help files for avidemux
@@ -266,9 +258,9 @@
 find ./ -name '*.sql' -exec dos2unix -q {} \;
 find ./ -name '*.txt' -exec dos2unix -q {} \;
 find . -type f -exec sed -i -e 's|intfloat_readwrite.h|intfloat.h|g' {} \;
-sed -i -e 's|set(FFMPEG_VERSION "2.6.1")|set(FFMPEG_VERSION "%{ffmpeg_version}")|g' cmake/admFFmpegBuild.cmake
-rm -f avidemux_core/ffmpeg_package/ffmpeg-2.6.1.tar.bz2
-cp %{S:3} avidemux_core/ffmpeg_package/
+sed -i -e 's|set(FFMPEG_VERSION "2.7.2")|set(FFMPEG_VERSION "%{ffmpeg_version}")|g' cmake/admFFmpegBuild.cmake
+rm -f avidemux_core/ffmpeg_package/ffmpeg-2.7.2.tar.bz2
+cp %{S:2} avidemux_core/ffmpeg_package/
 pushd avidemux_core/ffmpeg_package/patches
 rm -f config.mak.diff
 rm -f libavcodec_put_bits.h.patch
@@ -277,16 +269,16 @@
 rm -f libavcodec_mpeg12enc.c.patch
 rm -f libavcodec_avcodec.h.patch
 rm -f libavcodec_nvenc.patch
+cp %{S:3} .
 cp %{S:4} .
-cp %{S:5} .
+cp %{S:6} .
 cp %{S:7} .
 cp %{S:8} .
 cp %{S:9} .
 cp %{S:10} .
-cp %{S:11} .
 pushd xvba
 rm -f xvba_support_from_xbmc_xvba.patch
-cp %{S:6} .
+cp %{S:5} .
 popd
 popd
 %patch0 -p0
@@ -298,6 +290,9 @@
 %patch6 -p0
 %patch7 -p0
 %patch8 -p1
+%if %{with build_qt5}
+%patch9 -p0
+%endif
 chmod 755 bootStrap.bash
 chmod 644 AUTHORS COPYING README
 
@@ -308,19 +303,26 @@
 export CXXFLAGS="%optflags -D__STDC_CONSTANT_MACROS -fno-strict-aliasing"
 %endif
 
-%if ! 0%{?sles_version}
-./bootStrap.bash --with-cli --with-gtk
+
+options+="--with-cli "
+%if 0%{?sles_version}
+options+="--without-qt4 "
 %else
-./bootStrap.bash --with-cli --without-qt4
+%if %{with build_qt5}
+options+="--with-qt4 --enable-qt5 "
+%else
+options+="--with-qt4 "
+%endif
 %endif
+./bootStrap.bash $options
 
 %install
 cp -r install/* %{buildroot}
 
 %if ! 0%{?sles_version}
-# Install desktop files
-install -D -m644 %{S:1} %{buildroot}%{_datadir}/applications/avidemux3-qt4.desktop
-install -D -m644 %{S:2} %{buildroot}%{_datadir}/applications/avidemux3-gtk.desktop
+# Install desktop file
+install -D -m644 %{S:1} %{buildroot}%{_datadir}/applications/avidemux3-qt%{qtversion}.desktop
+sed -i -e 's|qtversion|%{qtversion}|g' %{buildroot}%{_datadir}/applications/avidemux3-qt%{qtversion}.desktop
 
 # Install icon
 install -D -m644 avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux3.png
@@ -332,8 +334,6 @@
 # delete devel file (only needed for build)
 rm -rf %{buildroot}%{_includedir}
 
-## find . -name "config.mak" -exec install -D -m644 {} %{buildroot}%{_datadir}/avidemux3/help/config.mak \;
-
 %fdupes %buildroot
 
 %post -p /sbin/ldconfig
@@ -345,13 +345,9 @@
 %postun cli -p /sbin/ldconfig
 
 %if ! 0%{?sles_version}
-%post gtk -p /sbin/ldconfig
-
-%postun gtk -p /sbin/ldconfig
+%post qt%{qtversion} -p /sbin/ldconfig
 
-%post qt4 -p /sbin/ldconfig
-
-%postun qt4 -p /sbin/ldconfig
+%postun qt%{qtversion} -p /sbin/ldconfig
 %endif
 
 %files
@@ -477,6 +473,7 @@
 %{_libdir}/ADM_plugins6/videoFilters/libADM_hf_hflip.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_addBorders.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_avsfilter.so
+%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_black.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_blackenBorders.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_changeFps.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_colorYuv.so
@@ -485,6 +482,7 @@
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_denoise3dhq.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_DgBob.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_dummy.so
+%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_fadeTo.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_fadeToBlack.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_FluxSmooth.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_gauss.so
@@ -540,98 +538,38 @@
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_swscaleResize_cli.so
 
 %if ! 0%{?sles_version}
-%files gtk
-%defattr(-,root,root)
-%{_bindir}/avidemux3_gtk
-%{_libdir}/libADM_render6_gtk.so
-%{_libdir}/libADM_toolkitGtk.so
-%{_libdir}/libADM_UIGtk6.so
-%dir %{_libdir}/ADM_glade
-%dir %{_libdir}/ADM_glade/main
-%dir %{_libdir}/ADM_glade/videoFilter
-%{_libdir}/ADM_glade/about.gtkBuilder
-%{_libdir}/ADM_glade/avidemux_icon.png
-%{_libdir}/ADM_glade/calculator.gtkBuilder
-%{_libdir}/ADM_glade/DIA_alternate.gtkBuilder
-%{_libdir}/ADM_glade/encoding.gtkBuilder
-%{_libdir}/ADM_glade/main/avidemux_icon_small.png
-%{_libdir}/ADM_glade/main/first-frame.png
-%{_libdir}/ADM_glade/main/gtk2_build.gtkBuilder
-%{_libdir}/ADM_glade/main/last-frame.png
-%{_libdir}/ADM_glade/main/markA.png
-%{_libdir}/ADM_glade/main/markB.png
-%{_libdir}/ADM_glade/main/next-black-frame.png
-%{_libdir}/ADM_glade/main/next-frame.png
-%{_libdir}/ADM_glade/main/next-key-frame.png
-%{_libdir}/ADM_glade/main/play.png
-%{_libdir}/ADM_glade/main/previous-black-frame.png
-%{_libdir}/ADM_glade/main/previous-frame.png
-%{_libdir}/ADM_glade/main/previous-key-frame.png
-%{_libdir}/ADM_glade/main/stop.png
-%{_libdir}/ADM_glade/properties.gtkBuilder
-%{_libdir}/ADM_glade/videoFilter/1.png
-%{_libdir}/ADM_glade/videoFilter/2.png
-%{_libdir}/ADM_glade/videoFilter/3.png
-%{_libdir}/ADM_glade/videoFilter/4.png
-%{_libdir}/ADM_glade/videoFilter/5.png
-%{_libdir}/ADM_glade/videoFilter/6.png
-%{_libdir}/ADM_glade/videoFilter/7.png
-%{_libdir}/ADM_glade/videoFilter/add.png
-%{_libdir}/ADM_glade/videoFilter/cd.png
-%{_libdir}/ADM_glade/videoFilter/close.png
-%{_libdir}/ADM_glade/videoFilter/down.png
-%{_libdir}/ADM_glade/videoFilter/exec.png
-%{_libdir}/ADM_glade/videoFilter/fileopen.png
-%{_libdir}/ADM_glade/videoFilter/filesave.png
-%{_libdir}/ADM_glade/videoFilter/filesaveas.png
-%{_libdir}/ADM_glade/videoFilter/gl.png
-%{_libdir}/ADM_glade/videoFilter/remove.png
-%{_libdir}/ADM_glade/videoFilter/thumbnail.png
-%{_libdir}/ADM_glade/videoFilter/up.png
-%{_libdir}/ADM_glade/videoFilter/videoFilter.gtkBuilder
-%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_x264_gtk.so
-%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_x265_gtk.so
-%dir %{_libdir}/ADM_plugins6/videoFilters/gtk
-%{_libdir}/ADM_plugins6/videoFilters/gtk/libADM_vf_asharpGtk.so
-%{_libdir}/ADM_plugins6/videoFilters/gtk/libADM_vf_chromaShiftGtk.so
-%{_libdir}/ADM_plugins6/videoFilters/gtk/libADM_vf_contrastGtk.so
-%{_libdir}/ADM_plugins6/videoFilters/gtk/libADM_vf_cropGtk.so
-%{_libdir}/ADM_plugins6/videoFilters/gtk/libADM_vf_eq2Gtk.so
-%{_libdir}/ADM_plugins6/videoFilters/gtk/libADM_vf_HueGtk.so
-%{_libdir}/ADM_plugins6/videoFilters/gtk/libADM_vf_swscaleResize_gtk.so
-%{_datadir}/applications/avidemux3-gtk.desktop
-
-%files qt4
+%files qt%{qtversion}
 %defattr(-,root,root)
-%{_bindir}/avidemux3_jobs_qt4
-%{_bindir}/avidemux3_qt4
-%{_libdir}/libADM_render6_QT4.so
-%{_libdir}/libADM_UIQT46.so
-%dir %{_libdir}/ADM_plugins6/scriptEngines/qt4
-%dir %{_libdir}/ADM_plugins6/videoEncoders/qt4
-%dir %{_libdir}/ADM_plugins6/videoFilters/qt4
-%{_libdir}/ADM_plugins6/scriptEngines/qt4/libadm_script_QT4.so
-%{_libdir}/ADM_plugins6/videoEncoders/qt4/libADM_ve_x264_QT4.so
-%{_libdir}/ADM_plugins6/videoEncoders/qt4/libADM_ve_x265_QT4.so
-%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_asharpQT4.so
-%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_chromaShiftQT4.so
-%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_contrastQT4.so
-%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_cropQT4.so
-%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_eq2QT4.so
-%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_glBenchmark.so
-%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_glResize.so
-%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_HueQT4.so
-%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_mpdelogoQT4.so
-%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_rotateGlFrag2.so
-%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_sampleGlFrag2.so
-%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_sampleGlVertex.so
-%{_libdir}/ADM_plugins6/videoFilters/qt4/libADM_vf_swscaleResizeQT4.so
-%{_datadir}/applications/avidemux3-qt4.desktop
-
-%files -n avidemux3-qt4-lang
+%{_bindir}/avidemux3_jobs_qt%{qtversion}
+%{_bindir}/avidemux3_qt%{qtversion}
+%{_libdir}/libADM_openGLQT%{qtversion}6.so
+%{_libdir}/libADM_render6_QT%{qtversion}.so
+%{_libdir}/libADM_UIQT%{qtversion}6.so
+%dir %{_libdir}/ADM_plugins6/scriptEngines/qt%{qtversion}
+%dir %{_libdir}/ADM_plugins6/videoEncoders/qt%{qtversion}
+%dir %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}
+%{_libdir}/ADM_plugins6/scriptEngines/qt%{qtversion}/libadm_script_QT%{qtversion}.so
+%{_libdir}/ADM_plugins6/videoEncoders/qt%{qtversion}/libADM_ve_x264_QT%{qtversion}.so
+%{_libdir}/ADM_plugins6/videoEncoders/qt%{qtversion}/libADM_ve_x265_QT%{qtversion}.so
+%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_asharpQT%{qtversion}.so
+%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_chromaShiftQT%{qtversion}.so
+%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_contrastQT%{qtversion}.so
+%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_cropQT%{qtversion}.so
+%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_eq2QT%{qtversion}.so
+%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_glBenchmark.so
+%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_glResize.so
+%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_HueQT%{qtversion}.so
+%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_mpdelogoQT%{qtversion}.so
+%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_rotateGlFrag2.so
+%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_sampleGlFrag2.so
+%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_sampleGlVertex.so
+%{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_swscaleResizeQT%{qtversion}.so
+%{_datadir}/applications/avidemux3-qt%{qtversion}.desktop
+
+%files -n avidemux3-qt%{qtversion}-lang
 %defattr(-,root,root)
-%dir %{_datadir}/avidemux3/qt4
-%{_datadir}/avidemux3/qt4/i18n/
+%dir %{_datadir}/avidemux3/qt%{qtversion}
+%{_datadir}/avidemux3/qt%{qtversion}/i18n/
 
 %files help
 %defattr(-,root,root)

avidemux-find-lrelease-qt5.patch Added

avidemux-linking.patch Changed

avidemux-x264_plugins.patch Changed

@@ -1,6 +1,6 @@
 --- avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt.orig	2015-02-23 18:53:40.000000000 +0100
 +++ avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt	2015-02-26 14:06:02.512830400 +0100
-@@ -27,15 +27,26 @@
+@@ -27,15 +27,16 @@
      INSTALL_VIDEO_ENCODER_QT4(ADM_ve_x264_${QT_LIBRARY_EXTENSION})
    endif(DO_QT4)
    #-----------------------/QT4 VERSION---------------------
@@ -23,16 +23,6 @@
 +    INSTALL_VIDEO_ENCODER(ADM_ve_x264_cli)
 +  endif(DO_CLI)
 +  #-----------------------/CLI VERSION---------------------
-+  #-----------------------GTK VERSION----------------------
-+  if(DO_GTK)
-+    ADD_VIDEO_ENCODER(ADM_ve_x264_gtk   ADM_x264_noui.cpp ${x264_SRCS})
-+    ADD_TARGET_CFLAGS(ADM_ve_x264_gtk "-DADM_UI_TYPE_BUILD=1") # GTK!
-+    TARGET_LINK_LIBRARIES(ADM_ve_x264_gtk "${X264_LIBRARY_DIR}")
-+    TARGET_LINK_LIBRARIES(ADM_ve_x264_gtk ADM_core6)
-+    INIT_VIDEO_ENCODER(ADM_ve_x264_gtk)
-+    INSTALL_VIDEO_ENCODER(ADM_ve_x264_gtk)
-+  endif(DO_GTK)
-+  #-----------------------/GTK VERSION---------------------
    # ------------- PRESET -----------
    if(DO_SETTINGS)
      FILE(GLOB json_files ${CMAKE_CURRENT_SOURCE_DIR}/preset/*.json)

avidemux-x265_plugins.patch Changed

@@ -1,6 +1,6 @@
 --- avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt.orig	2015-02-23 18:53:40.000000000 +0100
 +++ avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt	2015-02-26 14:06:03.794031200 +0100
-@@ -27,15 +27,26 @@
+@@ -27,15 +27,16 @@
      INSTALL_VIDEO_ENCODER_QT4(ADM_ve_x265_${QT_LIBRARY_EXTENSION})
    endif(DO_QT4)
    #-----------------------/QT4 VERSION---------------------
@@ -23,16 +23,6 @@
 +    INSTALL_VIDEO_ENCODER(ADM_ve_x265_cli)
 +  endif(DO_CLI)
 +  #-----------------------/CLI VERSION---------------------
-+  #-----------------------GTK VERSION----------------------
-+  if(DO_GTK)
-+    ADD_VIDEO_ENCODER(ADM_ve_x265_gtk   ADM_x265_noui.cpp ${x265_SRCS})
-+    ADD_TARGET_CFLAGS(ADM_ve_x265_gtk "-DADM_UI_TYPE_BUILD=1") # GTK!
-+    TARGET_LINK_LIBRARIES(ADM_ve_x265_gtk "${X265_LIBRARY_DIR}")
-+    TARGET_LINK_LIBRARIES(ADM_ve_x265_gtk ADM_core6)
-+    INIT_VIDEO_ENCODER(ADM_ve_x265_gtk)
-+    INSTALL_VIDEO_ENCODER(ADM_ve_x265_gtk)
-+  endif(DO_GTK)
-+  #-----------------------/GTK VERSION---------------------
    # ------------- PRESET -----------
    if(DO_SETTINGS)
      FILE(GLOB json_files ${CMAKE_CURRENT_SOURCE_DIR}/preset/*.json)

avidemux3-gtk.desktop Deleted

avidemux3-qt.desktop Added

avidemux3-qt4.desktop Deleted

avidemux_2.6.10.tar.gz -> avidemux_2.6.11.tar.gz Changed

ffmpeg-2.8.5.tar.bz2/Changelog -> ffmpeg-2.8.6.tar.bz2/Changelog Changed

@@ -2,6 +2,51 @@
 releases are sorted from youngest to oldest.
 
 
+version 2.8.6
+- avcodec/jpeg2000dec: More completely check cdef
+- avutil/opt: check for and handle errors in av_opt_set_dict2()
+- avcodec/flacenc: fix calculation of bits required in case of custom sample rate
+- avformat: Document urls a bit
+- avformat/libquvi: Set default demuxer and protocol limitations
+- avformat/concat: Check protocol prefix
+- doc/demuxers: Document enable_drefs and use_absolute_path
+- avcodec/mjpegdec: Check for end for both bytes in unescaping
+- avcodec/mpegvideo_enc: Check for integer overflow in ff_mpv_reallocate_putbitbuffer()
+- avformat/avformat: Replace some references to filenames by urls
+- avcodec/wmaenc: Check ff_wma_init() for failure
+- avcodec/mpeg12enc: Move high resolution thread check to before initializing threads
+- avformat/img2dec: Use AVOpenCallback
+- avformat/avio: Limit url option parsing to the documented cases
+- avformat/img2dec: do not interpret the filename by default if a IO context has been opened
+- avcodec/ass_split: Fix null pointer dereference in ff_ass_style_get()
+- mov: Add an option to toggle dref opening
+- avcodec/gif: Fix lzw buffer size
+- avcodec/put_bits: Assert buf_ptr in flush_put_bits()
+- avcodec/tiff: Check subsample & rps values more completely
+- swscale/swscale: Add some sanity checks for srcSlice* parameters
+- swscale/x86/rgb2rgb_template: Fix planar2x() for short width
+- swscale/swscale_unscaled: Fix odd height inputs for bayer_to_yv12_wrapper()
+- swscale/swscale_unscaled: Fix odd height inputs for bayer_to_rgb24_wrapper()
+- avcodec/aacenc: Check both channels for finiteness
+- asfdec_o: check for too small size in asf_read_unknown
+- asfdec_o: break if EOF is reached after asf_read_packet_header
+- asfdec_o: make sure packet_size is non-zero before seeking
+- asfdec_o: prevent overflow causing seekback
+- asfdec_o: check avio_skip in asf_read_simple_index
+- asfdec_o: reject size > INT64_MAX in asf_read_unknown
+- asfdec_o: only set asf_pkt->data_size after sanity checks
+- Merge commit '8375dc1dd101d51baa430f34c0bcadfa37873896'
+- dca: fix misaligned access in avpriv_dca_convert_bitstream
+- brstm: fix missing closing brace
+- brstm: also allocate b->table in read_packet
+- brstm: make sure an ADPC chunk was read for adpcm_thp
+- vorbisdec: reject rangebits 0 with non-0 partitions
+- vorbisdec: reject channel mapping with less than two channels
+- ffmdec: reset packet_end in case of failure
+- avformat/ipmovie: put video decoding_map_size into packet and use it in decoder
+- avformat/brstm: fix overflow
+
+
 version 2.8.5
 - avformat/hls: Even stricter URL checks
 - avformat/hls: More strict url checks

ffmpeg-2.8.5.tar.bz2/RELEASE -> ffmpeg-2.8.6.tar.bz2/RELEASE Changed

ffmpeg-2.8.5.tar.bz2/VERSION -> ffmpeg-2.8.6.tar.bz2/VERSION Changed

ffmpeg-2.8.5.tar.bz2/doc/Doxyfile -> ffmpeg-2.8.6.tar.bz2/doc/Doxyfile Changed

ffmpeg-2.8.5.tar.bz2/doc/demuxers.texi -> ffmpeg-2.8.6.tar.bz2/doc/demuxers.texi Changed

ffmpeg-2.8.5.tar.bz2/libavcodec/aacenc.c -> ffmpeg-2.8.6.tar.bz2/libavcodec/aacenc.c Changed

@@ -572,8 +572,16 @@
             }
 
             apply_window_and_mdct(s, &cpe->ch[ch], overlap);
-            if (isnan(cpe->ch->coeffs[0])) {
-                av_log(avctx, AV_LOG_ERROR, "Input contains NaN\n");
+
+            if (isnan(cpe->ch[ch].coeffs[    0]) || isinf(cpe->ch[ch].coeffs[    0]) ||
+                isnan(cpe->ch[ch].coeffs[  128]) || isinf(cpe->ch[ch].coeffs[  128]) ||
+                isnan(cpe->ch[ch].coeffs[2*128]) || isinf(cpe->ch[ch].coeffs[2*128]) ||
+                isnan(cpe->ch[ch].coeffs[3*128]) || isinf(cpe->ch[ch].coeffs[3*128]) ||
+                isnan(cpe->ch[ch].coeffs[4*128]) || isinf(cpe->ch[ch].coeffs[4*128]) ||
+                isnan(cpe->ch[ch].coeffs[5*128]) || isinf(cpe->ch[ch].coeffs[5*128]) ||
+                isnan(cpe->ch[ch].coeffs[6*128]) || isinf(cpe->ch[ch].coeffs[6*128]) ||
+                isnan(cpe->ch[ch].coeffs[7*128]) || isinf(cpe->ch[ch].coeffs[7*128])) {
+                av_log(avctx, AV_LOG_ERROR, "Input contains NaN/+-Inf\n");
                 return AVERROR(EINVAL);
             }
             avoid_clipping(s, &cpe->ch[ch]);

ffmpeg-2.8.5.tar.bz2/libavcodec/ass_split.c -> ffmpeg-2.8.6.tar.bz2/libavcodec/ass_split.c Changed

ffmpeg-2.8.5.tar.bz2/libavcodec/dca.c -> ffmpeg-2.8.6.tar.bz2/libavcodec/dca.c Changed

ffmpeg-2.8.5.tar.bz2/libavcodec/flacenc.c -> ffmpeg-2.8.6.tar.bz2/libavcodec/flacenc.c Changed

ffmpeg-2.8.5.tar.bz2/libavcodec/gif.c -> ffmpeg-2.8.6.tar.bz2/libavcodec/gif.c Changed

@@ -43,6 +43,7 @@
     const AVClass *class;
     LZWState *lzw;
     uint8_t *buf;
+    int buf_size;
     AVFrame *last_frame;
     int flags;
     uint32_t palette[AVPALETTE_COUNT];  ///< local reference palette for !pal8
@@ -174,7 +175,7 @@
 
     bytestream_put_byte(bytestream, 0x08);
 
-    ff_lzw_encode_init(s->lzw, s->buf, 2 * width * height,
+    ff_lzw_encode_init(s->lzw, s->buf, s->buf_size,
                        12, FF_LZW_GIF, put_bits);
 
     ptr = buf + y_start*linesize + x_start;
@@ -231,7 +232,8 @@
     s->transparent_index = -1;
 
     s->lzw = av_mallocz(ff_lzw_encode_state_size);
-    s->buf = av_malloc(avctx->width*avctx->height*2);
+    s->buf_size = avctx->width*avctx->height*2 + 1000;
+    s->buf = av_malloc(s->buf_size);
     s->tmpl = av_malloc(avctx->width);
     if (!s->tmpl || !s->buf || !s->lzw)
         return AVERROR(ENOMEM);
@@ -321,6 +323,7 @@
 
     av_freep(&s->lzw);
     av_freep(&s->buf);
+    s->buf_size = 0;
     av_frame_free(&s->last_frame);
     av_freep(&s->tmpl);
     return 0;

ffmpeg-2.8.5.tar.bz2/libavcodec/interplayvideo.c -> ffmpeg-2.8.6.tar.bz2/libavcodec/interplayvideo.c Changed

@@ -38,6 +38,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "bytestream.h"
 #include "hpeldsp.h"
@@ -949,7 +950,7 @@
         }
     }
     if (bytestream2_get_bytes_left(&s->stream_ptr) > 1) {
-        av_log(s->avctx, AV_LOG_ERROR,
+        av_log(s->avctx, AV_LOG_DEBUG,
                "decode finished with %d bytes left over\n",
                bytestream2_get_bytes_left(&s->stream_ptr));
     }
@@ -987,12 +988,15 @@
     AVFrame *frame = data;
     int ret;
 
+    if (buf_size < 2)
+        return AVERROR_INVALIDDATA;
+
     /* decoding map contains 4 bits of information per 8x8 block */
-    s->decoding_map_size = avctx->width * avctx->height / (8 * 8 * 2);
+    s->decoding_map_size = AV_RL16(avpkt->data);
 
     /* compressed buffer needs to be large enough to at least hold an entire
      * decoding map */
-    if (buf_size < s->decoding_map_size)
+    if (buf_size < s->decoding_map_size + 2)
         return buf_size;
 
     if (av_packet_get_side_data(avpkt, AV_PKT_DATA_PARAM_CHANGE, NULL)) {
@@ -1000,8 +1004,8 @@
         av_frame_unref(s->second_last_frame);
     }
 
-    s->decoding_map = buf;
-    bytestream2_init(&s->stream_ptr, buf + s->decoding_map_size,
+    s->decoding_map = buf + 2;
+    bytestream2_init(&s->stream_ptr, buf + 2 + s->decoding_map_size,
                      buf_size - s->decoding_map_size);
 
     if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0)

ffmpeg-2.8.5.tar.bz2/libavcodec/jpeg2000dec.c -> ffmpeg-2.8.6.tar.bz2/libavcodec/jpeg2000dec.c Changed

ffmpeg-2.8.5.tar.bz2/libavcodec/mjpegdec.c -> ffmpeg-2.8.6.tar.bz2/libavcodec/mjpegdec.c Changed

ffmpeg-2.8.5.tar.bz2/libavcodec/mpeg12enc.c -> ffmpeg-2.8.6.tar.bz2/libavcodec/mpeg12enc.c Changed

ffmpeg-2.8.5.tar.bz2/libavcodec/mpegvideo_enc.c -> ffmpeg-2.8.6.tar.bz2/libavcodec/mpegvideo_enc.c Changed

ffmpeg-2.8.5.tar.bz2/libavcodec/pthread_slice.c -> ffmpeg-2.8.6.tar.bz2/libavcodec/pthread_slice.c Changed

ffmpeg-2.8.5.tar.bz2/libavcodec/put_bits.h -> ffmpeg-2.8.6.tar.bz2/libavcodec/put_bits.h Changed

ffmpeg-2.8.5.tar.bz2/libavcodec/tiff.c -> ffmpeg-2.8.6.tar.bz2/libavcodec/tiff.c Changed

ffmpeg-2.8.5.tar.bz2/libavcodec/vorbisdec.c -> ffmpeg-2.8.6.tar.bz2/libavcodec/vorbisdec.c Changed

@@ -573,6 +573,11 @@
                 return AVERROR(ENOMEM);
 
             rangebits = get_bits(gb, 4);
+            if (!rangebits && floor_setup->data.t1.partitions) {
+                av_log(vc->avctx, AV_LOG_ERROR,
+                       "A rangebits value of 0 is not compliant with the Vorbis I specification.\n");
+                return AVERROR_INVALIDDATA;
+            }
             rangemax = (1 << rangebits);
             if (rangemax > vc->blocksize[1] / 2) {
                 av_log(vc->avctx, AV_LOG_ERROR,
@@ -789,6 +794,11 @@
 
         if (get_bits1(gb)) {
             mapping_setup->coupling_steps = get_bits(gb, 8) + 1;
+            if (vc->audio_channels < 2) {
+                av_log(vc->avctx, AV_LOG_ERROR,
+                       "Square polar channel mapping with less than two channels is not compliant with the Vorbis I specification.\n");
+                return AVERROR_INVALIDDATA;
+            }
             mapping_setup->magnitude      = av_mallocz(mapping_setup->coupling_steps *
                                                        sizeof(*mapping_setup->magnitude));
             mapping_setup->angle          = av_mallocz(mapping_setup->coupling_steps *

ffmpeg-2.8.5.tar.bz2/libavcodec/wmaenc.c -> ffmpeg-2.8.6.tar.bz2/libavcodec/wmaenc.c Changed

ffmpeg-2.8.5.tar.bz2/libavformat/asfdec_o.c -> ffmpeg-2.8.6.tar.bz2/libavformat/asfdec_o.c Changed

@@ -167,7 +167,7 @@
 
 static void align_position(AVIOContext *pb,  int64_t offset, uint64_t size)
 {
-    if (avio_tell(pb) != offset + size)
+    if (size < INT64_MAX - offset && avio_tell(pb) != offset + size)
         avio_seek(pb, offset + size, SEEK_SET);
 }
 
@@ -178,6 +178,9 @@
     uint64_t size   = avio_rl64(pb);
     int ret;
 
+    if (size > INT64_MAX)
+        return AVERROR_INVALIDDATA;
+
     if (asf->is_header)
         asf->unknown_size = size;
     asf->is_header = 0;
@@ -187,8 +190,13 @@
         if ((ret = detect_unknown_subobject(s, asf->unknown_offset,
                                             asf->unknown_size)) < 0)
             return ret;
-    } else
+    } else {
+        if (size < 24) {
+            av_log(s, AV_LOG_ERROR, "Too small size %"PRIu64" (< 24).\n", size);
+            return AVERROR_INVALIDDATA;
+        }
         avio_skip(pb, size - 24);
+    }
 
     return 0;
 }
@@ -967,7 +975,7 @@
     uint64_t interval; // index entry time interval in 100 ns units, usually it's 1s
     uint32_t pkt_num, nb_entries;
     int32_t prev_pkt_num = -1;
-    int i;
+    int i, ret;
     uint64_t size = avio_rl64(pb);
 
     // simple index objects should be ordered by stream number, this loop tries to find
@@ -989,7 +997,11 @@
     nb_entries = avio_rl32(pb);
     for (i = 0; i < nb_entries; i++) {
         pkt_num = avio_rl32(pb);
-        avio_skip(pb, 2);
+        ret = avio_skip(pb, 2);
+        if (ret < 0) {
+            av_log(s, AV_LOG_ERROR, "Skipping failed in asf_read_simple_index.\n");
+            return ret;
+        }
         if (prev_pkt_num != pkt_num) {
             av_add_index_entry(st, asf->first_packet_offset + asf->packet_size *
                                pkt_num, av_rescale(interval, i, 10000),
@@ -1136,14 +1148,15 @@
 {
     ASFContext *asf = s->priv_data;
     AVIOContext *pb = s->pb;
-    int ret;
+    int ret, data_size;
 
     if (!asf_pkt->data_size) {
-        asf_pkt->data_size = asf_pkt->size_left = avio_rl32(pb); // read media object size
-        if (asf_pkt->data_size <= 0)
+        data_size = avio_rl32(pb); // read media object size
+        if (data_size <= 0)
             return AVERROR_INVALIDDATA;
-        if ((ret = av_new_packet(&asf_pkt->avpkt, asf_pkt->data_size)) < 0)
+        if ((ret = av_new_packet(&asf_pkt->avpkt, data_size)) < 0)
             return ret;
+        asf_pkt->data_size = asf_pkt->size_left = data_size;
     } else
         avio_skip(pb, 4); // reading of media object size is already done
     asf_pkt->dts = avio_rl32(pb); // read presentation time
@@ -1212,14 +1225,15 @@
     int64_t  offset;
     uint64_t size;
     unsigned char *p;
-    int ret;
+    int ret, data_size;
 
     if (!asf_pkt->data_size) {
-        asf_pkt->data_size = asf_pkt->size_left = avio_rl32(pb); // read media object size
-        if (asf_pkt->data_size <= 0)
+        data_size = avio_rl32(pb); // read media object size
+        if (data_size <= 0)
             return AVERROR_EOF;
-        if ((ret = av_new_packet(&asf_pkt->avpkt, asf_pkt->data_size)) < 0)
+        if ((ret = av_new_packet(&asf_pkt->avpkt, data_size)) < 0)
             return ret;
+        asf_pkt->data_size = asf_pkt->size_left = data_size;
     } else
         avio_skip(pb, 4); // skip media object size
     asf_pkt->dts = avio_rl32(pb); // read presentation time
@@ -1276,8 +1290,20 @@
                 break;
             }
         }
-        if (!asf_pkt)
-            return AVERROR_INVALIDDATA;
+        if (!asf_pkt) {
+            if (asf->packet_offset + asf->packet_size <= asf->data_offset + asf->data_size) {
+                if (!asf->packet_size) {
+                    av_log(s, AV_LOG_ERROR, "Invalid packet size 0.\n");
+                    return AVERROR_INVALIDDATA;
+                }
+                avio_seek(pb, asf->packet_offset + asf->packet_size, SEEK_SET);
+                av_log(s, AV_LOG_WARNING, "Skipping the stream with the invalid stream index %d.\n",
+                       asf->stream_index);
+                return AVERROR(EAGAIN);
+            } else
+                return AVERROR_INVALIDDATA;
+        }
+
         if (stream_num >> 7)
             asf_pkt->flags |= AV_PKT_FLAG_KEY;
         READ_LEN(asf->prop_flags & ASF_PL_MASK_MEDIA_OBJECT_NUMBER_LENGTH_FIELD_SIZE,
@@ -1413,13 +1439,21 @@
     while (!pb->eof_reached) {
         if (asf->state == PARSE_PACKET_HEADER) {
             asf_read_packet_header(s);
+            if (pb->eof_reached)
+                break;
             if (!asf->nb_mult_left)
                 asf->state = READ_SINGLE;
             else
                 asf->state = READ_MULTI;
         }
-        if ((ret = asf_read_payload(s, pkt)) < 0)
+        ret = asf_read_payload(s, pkt);
+        if (ret == AVERROR(EAGAIN)) {
+            asf->state = PARSE_PACKET_HEADER;
+            continue;
+        }
+        else if (ret < 0)
             return ret;
+
         switch (asf->state) {
         case READ_SINGLE:
             if (!asf->sub_left)

ffmpeg-2.8.5.tar.bz2/libavformat/avformat.h -> ffmpeg-2.8.6.tar.bz2/libavformat/avformat.h Changed

@@ -78,6 +78,18 @@
  * if its AVClass is non-NULL, and the protocols layer. See the discussion on
  * nesting in @ref avoptions documentation to learn how to access those.
  *
+ * @section urls
+ * URL strings in libavformat are made of a scheme/protocol, a ':', and a
+ * scheme specific string. URLs without a scheme and ':' used for local files
+ * are supported but deprecated. "file:" should be used for local files.
+ *
+ * It is important that the scheme string is not taken from untrusted
+ * sources without checks.
+ *
+ * Note that some schemes/protocols are quite powerful, allowing access to
+ * both local and remote files, parts of them, concatenations of them, local
+ * audio and video devices and so on.
+ *
  * @defgroup lavf_decoding Demuxing
  * @{
  * Demuxers read a media file and split it into chunks of data (@em packets). A
@@ -88,10 +100,10 @@
  * cleanup.
  *
  * @section lavf_decoding_open Opening a media file
- * The minimum information required to open a file is its URL or filename, which
+ * The minimum information required to open a file is its URL, which
  * is passed to avformat_open_input(), as in the following code:
  * @code
- * const char    *url = "in.mp3";
+ * const char    *url = "file:in.mp3";
  * AVFormatContext *s = NULL;
  * int ret = avformat_open_input(&s, url, NULL, NULL);
  * if (ret < 0)
@@ -2044,7 +2056,7 @@
  *
  * @param pb the bytestream to probe
  * @param fmt the input format is put here
- * @param filename the filename of the stream
+ * @param url the url of the stream
  * @param logctx the log context
  * @param offset the offset within the bytestream to probe from
  * @param max_probe_size the maximum probe buffer size (zero for default)
@@ -2053,14 +2065,14 @@
  * AVERROR code otherwise
  */
 int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt,
-                           const char *filename, void *logctx,
+                           const char *url, void *logctx,
                            unsigned int offset, unsigned int max_probe_size);
 
 /**
  * Like av_probe_input_buffer2() but returns 0 on success
  */
 int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
-                          const char *filename, void *logctx,
+                          const char *url, void *logctx,
                           unsigned int offset, unsigned int max_probe_size);
 
 /**
@@ -2071,7 +2083,7 @@
  *           May be a pointer to NULL, in which case an AVFormatContext is allocated by this
  *           function and written into ps.
  *           Note that a user-supplied AVFormatContext will be freed on failure.
- * @param filename Name of the stream to open.
+ * @param url URL of the stream to open.
  * @param fmt If non-NULL, this parameter forces a specific input format.
  *            Otherwise the format is autodetected.
  * @param options  A dictionary filled with AVFormatContext and demuxer-private options.
@@ -2082,7 +2094,7 @@
  *
  * @note If you want to use custom IO, preallocate the format context and set its pb field.
  */
-int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputFormat *fmt, AVDictionary **options);
+int avformat_open_input(AVFormatContext **ps, const char *url, AVInputFormat *fmt, AVDictionary **options);
 
 attribute_deprecated
 int av_demuxer_open(AVFormatContext *ic);

ffmpeg-2.8.5.tar.bz2/libavformat/avio.c -> ffmpeg-2.8.6.tar.bz2/libavformat/avio.c Changed

@@ -156,9 +156,16 @@
                 char sep= *++p;
                 char *key, *val;
                 p++;
+
+                if (strcmp(up->name, "subfile"))
+                    ret = AVERROR(EINVAL);
+
                 while(ret >= 0 && (key= strchr(p, sep)) && p<key && (val = strchr(key+1, sep))){
                     *val= *key= 0;
-                    ret= av_opt_set(uc->priv_data, p, key+1, 0);
+                    if (strcmp(p, "start") && strcmp(p, "end")) {
+                        ret = AVERROR_OPTION_NOT_FOUND;
+                    } else
+                        ret= av_opt_set(uc->priv_data, p, key+1, 0);
                     if (ret == AVERROR_OPTION_NOT_FOUND)
                         av_log(uc, AV_LOG_ERROR, "Key '%s' not found.\n", p);
                     *val= *key= sep;
@@ -243,7 +250,7 @@
     size_t proto_len = strspn(filename, URL_SCHEME_CHARS);
 
     if (filename[proto_len] != ':' &&
-        (filename[proto_len] != ',' || !strchr(filename + proto_len + 1, ':')) ||
+        (strncmp(filename, "subfile,", 8) || !strchr(filename + proto_len + 1, ':')) ||
         is_dos_path(filename))
         strcpy(proto_str, "file");
     else

ffmpeg-2.8.5.tar.bz2/libavformat/brstm.c -> ffmpeg-2.8.6.tar.bz2/libavformat/brstm.c Changed

ffmpeg-2.8.5.tar.bz2/libavformat/concat.c -> ffmpeg-2.8.6.tar.bz2/libavformat/concat.c Changed

ffmpeg-2.8.5.tar.bz2/libavformat/ffmdec.c -> ffmpeg-2.8.6.tar.bz2/libavformat/ffmdec.c Changed

@@ -114,9 +114,10 @@
             ffm->dts = avio_rb64(pb);
             frame_offset = avio_rb16(pb);
             avio_read(pb, ffm->packet, ffm->packet_size - FFM_HEADER_SIZE);
-            ffm->packet_end = ffm->packet + (ffm->packet_size - FFM_HEADER_SIZE - fill_size);
-            if (ffm->packet_end < ffm->packet || frame_offset < 0)
+            if (ffm->packet_size < FFM_HEADER_SIZE + fill_size || frame_offset < 0) {
                 return -1;
+            }
+            ffm->packet_end = ffm->packet + (ffm->packet_size - FFM_HEADER_SIZE - fill_size);
             /* if first packet or resynchronization packet, we must
                handle it specifically */
             if (ffm->first_packet || (frame_offset & 0x8000)) {
@@ -132,8 +133,10 @@
                     return 0;
                 }
                 ffm->first_packet = 0;
-                if ((frame_offset & 0x7fff) < FFM_HEADER_SIZE)
+                if ((frame_offset & 0x7fff) < FFM_HEADER_SIZE) {
+                    ffm->packet_end = ffm->packet_ptr;
                     return -1;
+                }
                 ffm->packet_ptr = ffm->packet + (frame_offset & 0x7fff) - FFM_HEADER_SIZE;
                 if (!header)
                     break;

ffmpeg-2.8.5.tar.bz2/libavformat/img2.h -> ffmpeg-2.8.6.tar.bz2/libavformat/img2.h Changed

ffmpeg-2.8.5.tar.bz2/libavformat/img2dec.c -> ffmpeg-2.8.6.tar.bz2/libavformat/img2dec.c Changed

@@ -224,6 +224,13 @@
     }
 
     if (!s->is_pipe) {
+        if (s->pattern_type == PT_DEFAULT) {
+            if (s1->pb) {
+                s->pattern_type = PT_NONE;
+            } else
+                s->pattern_type = PT_GLOB_SEQUENCE;
+        }
+
         if (s->pattern_type == PT_GLOB_SEQUENCE) {
         s->use_glob = is_glob(s->path);
         if (s->use_glob) {
@@ -369,6 +376,10 @@
     int size[3]           = { 0 }, ret[3] = { 0 };
     AVIOContext *f[3]     = { NULL };
     AVCodecContext *codec = s1->streams[0]->codec;
+    AVOpenCallback open_func = s1->open_cb;
+
+    if (!open_func)
+        open_func = ffio_open2_wrapper;
 
     if (!s->is_pipe) {
         /* loop over input */
@@ -390,7 +401,7 @@
             return AVERROR(EIO);
         }
         for (i = 0; i < 3; i++) {
-            if (avio_open2(&f[i], filename, AVIO_FLAG_READ,
+            if (open_func(s1, &f[i], filename, AVIO_FLAG_READ,
                            &s1->interrupt_callback, NULL) < 0) {
                 if (i >= 1)
                     break;
@@ -550,7 +561,7 @@
     { "framerate",    "set the video framerate",             OFFSET(framerate),    AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, 0,   DEC },
     { "loop",         "force loop over input file sequence", OFFSET(loop),         AV_OPT_TYPE_INT,    {.i64 = 0   }, 0, 1,       DEC },
 
-    { "pattern_type", "set pattern type",                    OFFSET(pattern_type), AV_OPT_TYPE_INT,    {.i64=PT_GLOB_SEQUENCE}, 0,       INT_MAX, DEC, "pattern_type"},
+    { "pattern_type", "set pattern type",                    OFFSET(pattern_type), AV_OPT_TYPE_INT,    {.i64=PT_DEFAULT}, 0,       INT_MAX, DEC, "pattern_type"},
     { "glob_sequence","select glob/sequence pattern type",   0, AV_OPT_TYPE_CONST,  {.i64=PT_GLOB_SEQUENCE}, INT_MIN, INT_MAX, DEC, "pattern_type" },
     { "glob",         "select glob pattern type",            0, AV_OPT_TYPE_CONST,  {.i64=PT_GLOB         }, INT_MIN, INT_MAX, DEC, "pattern_type" },
     { "sequence",     "select sequence pattern type",        0, AV_OPT_TYPE_CONST,  {.i64=PT_SEQUENCE     }, INT_MIN, INT_MAX, DEC, "pattern_type" },

ffmpeg-2.8.5.tar.bz2/libavformat/ipmovie.c -> ffmpeg-2.8.6.tar.bz2/libavformat/ipmovie.c Changed

@@ -156,7 +156,7 @@
 
         /* send both the decode map and the video data together */
 
-        if (av_new_packet(pkt, s->decode_map_chunk_size + s->video_chunk_size))
+        if (av_new_packet(pkt, 2 + s->decode_map_chunk_size + s->video_chunk_size))
             return CHUNK_NOMEM;
 
         if (s->has_palette) {
@@ -178,7 +178,8 @@
         avio_seek(pb, s->decode_map_chunk_offset, SEEK_SET);
         s->decode_map_chunk_offset = 0;
 
-        if (avio_read(pb, pkt->data, s->decode_map_chunk_size) !=
+        AV_WL16(pkt->data, s->decode_map_chunk_size);
+        if (avio_read(pb, pkt->data + 2, s->decode_map_chunk_size) !=
             s->decode_map_chunk_size) {
             av_free_packet(pkt);
             return CHUNK_EOF;
@@ -187,7 +188,7 @@
         avio_seek(pb, s->video_chunk_offset, SEEK_SET);
         s->video_chunk_offset = 0;
 
-        if (avio_read(pb, pkt->data + s->decode_map_chunk_size,
+        if (avio_read(pb, pkt->data + 2 + s->decode_map_chunk_size,
             s->video_chunk_size) != s->video_chunk_size) {
             av_free_packet(pkt);
             return CHUNK_EOF;

ffmpeg-2.8.5.tar.bz2/libavformat/isom.h -> ffmpeg-2.8.6.tar.bz2/libavformat/isom.h Changed

ffmpeg-2.8.5.tar.bz2/libavformat/libquvi.c -> ffmpeg-2.8.6.tar.bz2/libavformat/libquvi.c Changed

ffmpeg-2.8.5.tar.bz2/libavformat/mov.c -> ffmpeg-2.8.6.tar.bz2/libavformat/mov.c Changed

@@ -3002,13 +3002,23 @@
 
     if (sc->dref_id-1 < sc->drefs_count && sc->drefs[sc->dref_id-1].path) {
         MOVDref *dref = &sc->drefs[sc->dref_id - 1];
-        if (mov_open_dref(c, &sc->pb, c->fc->filename, dref,
-                          &c->fc->interrupt_callback) < 0)
-            av_log(c->fc, AV_LOG_ERROR,
-                   "stream %d, error opening alias: path='%s', dir='%s', "
-                   "filename='%s', volume='%s', nlvl_from=%d, nlvl_to=%d\n",
+        if (c->enable_drefs) {
+            if (mov_open_dref(c, &sc->pb, c->fc->filename, dref,
+                              &c->fc->interrupt_callback) < 0)
+                av_log(c->fc, AV_LOG_ERROR,
+                       "stream %d, error opening alias: path='%s', dir='%s', "
+                       "filename='%s', volume='%s', nlvl_from=%d, nlvl_to=%d\n",
+                       st->index, dref->path, dref->dir, dref->filename,
+                       dref->volume, dref->nlvl_from, dref->nlvl_to);
+        } else {
+            av_log(c->fc, AV_LOG_WARNING,
+                   "Skipped opening external track: "
+                   "stream %d, alias: path='%s', dir='%s', "
+                   "filename='%s', volume='%s', nlvl_from=%d, nlvl_to=%d."
+                   "Set enable_drefs to allow this.\n",
                    st->index, dref->path, dref->dir, dref->filename,
                    dref->volume, dref->nlvl_from, dref->nlvl_to);
+        }
     } else {
         sc->pb = c->fc->pb;
         sc->pb_is_copied = 1;
@@ -4925,6 +4935,8 @@
         "Fixed key used for handling Audible AAX files", OFFSET(audible_fixed_key),
         AV_OPT_TYPE_BINARY, {.str="77214d4b196a87cd520045fd20a51d67"},
         .flags = AV_OPT_FLAG_DECODING_PARAM },
+    { "enable_drefs", "Enable external track support.", OFFSET(enable_drefs), AV_OPT_TYPE_INT,
+        {.i64 = 0}, 0, 1, FLAGS },
     { NULL },
 };

ffmpeg-2.8.5.tar.bz2/libavutil/opt.c -> ffmpeg-2.8.6.tar.bz2/libavutil/opt.c Changed

ffmpeg-2.8.5.tar.bz2/libswscale/swscale.c -> ffmpeg-2.8.6.tar.bz2/libswscale/swscale.c Changed

ffmpeg-2.8.5.tar.bz2/libswscale/swscale_unscaled.c -> ffmpeg-2.8.6.tar.bz2/libswscale/swscale_unscaled.c Changed

@@ -1059,6 +1059,8 @@
     default: return 0;
     }
 
+    av_assert0(srcSliceH > 1);
+
     copy(srcPtr, srcStride[0], dstPtr, dstStride[0], c->srcW);
     srcPtr += 2 * srcStride[0];
     dstPtr += 2 * dstStride[0];
@@ -1069,7 +1071,10 @@
         dstPtr += 2 * dstStride[0];
     }
 
-    copy(srcPtr, srcStride[0], dstPtr, dstStride[0], c->srcW);
+    if (i + 1 == srcSliceH) {
+        copy(srcPtr, -srcStride[0], dstPtr, -dstStride[0], c->srcW);
+    } else if (i < srcSliceH)
+        copy(srcPtr, srcStride[0], dstPtr, dstStride[0], c->srcW);
     return srcSliceH;
 }
 
@@ -1105,6 +1110,8 @@
     default: return 0;
     }
 
+    av_assert0(srcSliceH > 1);
+
     copy(srcPtr, srcStride[0], dstY, dstU, dstV, dstStride[0], c->srcW, c->input_rgb2yuv_table);
     srcPtr += 2 * srcStride[0];
     dstY   += 2 * dstStride[0];
@@ -1119,7 +1126,10 @@
         dstV   +=     dstStride[1];
     }
 
-    copy(srcPtr, srcStride[0], dstY, dstU, dstV, dstStride[0], c->srcW, c->input_rgb2yuv_table);
+    if (i + 1 == srcSliceH) {
+        copy(srcPtr, -srcStride[0], dstY, dstU, dstV, -dstStride[0], c->srcW, c->input_rgb2yuv_table);
+    } else if (i < srcSliceH)
+        copy(srcPtr, srcStride[0], dstY, dstU, dstV, dstStride[0], c->srcW, c->input_rgb2yuv_table);
     return srcSliceH;
 }

ffmpeg-2.8.5.tar.bz2/libswscale/x86/rgb2rgb_template.c -> ffmpeg-2.8.6.tar.bz2/libswscale/x86/rgb2rgb_template.c Changed

Overview

Request 2436 (accepted)

Request History