Request 2853 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 2853 (accepted)

Update to version 2.6.13

Created by enzokiel almost 10 years ago
In state accepted
Package maintainer: enzokiel

Submit avidemux3

Submit package home:enzokiel:...hes:Multimedia / avidemux3 to package Multimedia / avidemux3

avidemux3.changes Changed

@@ -1,4 +1,31 @@
 -------------------------------------------------------------------
+Sat Aug 20 11:14:21 UTC 2016 - joerg.lorenzen@ki.tng.de
+
+- Update to version 2.6.13
+  + OsX Toolchain updated
+  + Win64 Toolchain updated
+  + Linux AppImage (universal linux64 binaries)
+  + Core Update to libav* 3.0.2
+  + Edit Improved copy mode for h264/h265 video
+  + Audio AAC/ADTS import/export
+  + Filter new video filter : ivtcDupeRemover to remove duplicate
+    after 3:2 pulldown
+  + Qt Revamped refresh screen
+  + Filters ASS/SSA fixes
+  + Filters Improved logo filter with alpha channel
+  + Win32 Development files included in installer
+  + Filter ShaderLoader, load your openGL shaders as filters
+  + Linux Compatibility with newer gcc
+  + Filter Partial filter available only for one in/one out video
+    filters
+  + UI Add go fwd/go backward 60 sec buttons
+  + i18n Translations updated
+- Removed avidemux-find-lrelease-qt5.patch, fixed upstream
+- Fixed all patches
+- Disabled ix86 for SLES 11 because build currently fails
+  (perhaps compiler too old?)
+
+-------------------------------------------------------------------
 Tue Mar 08 16:09:34 UTC 2016 - joerg.lorenzen@ki.tng.de
 
 - Update to version 2.6.12

avidemux3.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package avidemux3
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,33 +23,22 @@
 %define         qtversion 4
 %endif
 
-%define         ffmpeg_version 2.8.6
-
 Name:           avidemux3
 Summary:        Graphical video editing and transcoding tool
-Version:        2.6.12
+Version:        2.6.13
 Release:        1
 Url:            http://avidemux.sourceforge.net/
 Source0:        avidemux_%{version}.tar.gz
 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
+Source2:        config.mak.diff
 Patch0:         avidemux-cmake-2.8.8.patch
 Patch1:         avidemux-linking.patch
 Patch2:         avidemux-x264_plugins.patch
 Patch3:         avidemux-x265_plugins.patch
 Patch4:         avidemux-package_version.patch
 Patch5:         avidemux-bootStrap.patch
-Patch6:         avidemux-cpu_armel.patch
-Patch7:         avidemux-cmake-permissions.patch
-Patch8:         avidemux-find-lrelease-qt5.patch
+Patch6:         avidemux-cmake-permissions.patch
+Patch7:         avidemux-cpu_armel.patch
 License:        GPL-2.0
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 
@@ -147,10 +136,15 @@
 %endif
 %endif
 
-# Main package requires at least one frontend (cli, gtk or qt4)
+# Main package requires at least one frontend (cli or qt4)
 Requires:       avidemux3-frontend = %{version}-%{release}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+# ix86 build for SLES 11 currently fails
+%if 0%{?sles_version}
+ExclusiveArch:  x86_64
+%endif
+
 %description
 Avidemux is a free video editor designed for simple cutting, filtering and
 encoding tasks. It supports many file types, including AVI, DVD compatible
@@ -187,7 +181,6 @@
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Provides:       avidemux3-frontend = %{version}-%{release}
 Requires:       avidemux3 = %{version}-%{release}
-Requires:       avidemux3-help = %{version}-%{release}
 Recommends:     avidemux3-qt%{qtversion}-lang = %{version}-%{release}
 
 %description qt%{qtversion}
@@ -222,24 +215,6 @@
 
 This package provides translations for package avidemux3-qt%{qtversion}.
 
-%package help
-Summary:        Help files for avidemux
-Group:          Productivity/Multimedia/Video/Editors and Convertors
-BuildArch:      noarch
-
-%description help
-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 contains the help files for avidemux.
-
 %endif
 
 %prep
@@ -250,36 +225,9 @@
 echo 'from Config import *' >> %{_sourcedir}/avidemux3-rpmlintrc
 echo 'addFilter("libdir-macro-in-noarch-package")' >> %{_sourcedir}/avidemux3-rpmlintrc
 %endif
-find ./ -name '*.bash' -exec dos2unix -q {} \;
-find ./ -name '*.cmake' -exec dos2unix -q {} \;
-find ./ -name '*.cpp' -exec dos2unix -q {} \;
-find ./ -name '*.sh' -exec dos2unix -q {} \;
-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.7.6")|set(FFMPEG_VERSION "%{ffmpeg_version}")|g' cmake/admFFmpegBuild.cmake
-rm -f avidemux_core/ffmpeg_package/ffmpeg-2.7.6.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
-rm -f libavcodec_x86_fmtconvert_init.c.patch
-rm -f libavcodec_mpegvideo_enc.c.patch
-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:6} .
-cp %{S:7} .
-cp %{S:8} .
-cp %{S:9} .
-cp %{S:10} .
-pushd xvba
-rm -f xvba_support_from_xbmc_xvba.patch
-cp %{S:5} .
-popd
-popd
+for i in bash cmake cpp sh sql txt; do
+  find . -name \*.$i -print0 | xargs -0 dos2unix -q
+done
 %patch0 -p0
 %patch1 -p0
 %patch2 -p0
@@ -287,10 +235,8 @@
 %patch4 -p0
 %patch5 -p0
 %patch6 -p0
-%patch7 -p1
-%if %{with build_qt5}
-%patch8 -p0
-%endif
+%patch7 -p0
+cp -f %{S:2} avidemux_core/ffmpeg_package/patches/
 chmod 755 bootStrap.bash
 chmod 644 AUTHORS COPYING README
 
@@ -301,15 +247,14 @@
 export CXXFLAGS="%optflags -D__STDC_CONSTANT_MACROS -fno-strict-aliasing"
 %endif
 
-
 options+="--with-cli "
 %if 0%{?sles_version}
 options+="--without-qt4 "
 %else
 %if %{with build_qt5}
-options+="--with-qt4 --enable-qt5 "
-%else
 options+="--with-qt4 "
+%else
+options+="--with-qt4 --enable-qt4 "
 %endif
 %endif
 ./bootStrap.bash $options
@@ -343,9 +288,13 @@
 %postun cli -p /sbin/ldconfig
 
 %if ! 0%{?sles_version}
-%post qt%{qtversion} -p /sbin/ldconfig
+%post qt%{qtversion}
+/sbin/ldconfig
+%desktop_database_post
 
-%postun qt%{qtversion} -p /sbin/ldconfig
+%postun qt%{qtversion}
+/sbin/ldconfig
+%desktop_database_postun
 %endif
 
 %files
@@ -456,7 +405,6 @@
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/veryFast.json
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/fast.json
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/iPhone.json
-%{_libdir}/ADM_plugins6/scriptEngines/libADM_script_spiderMonkey.so
 %{_libdir}/ADM_plugins6/scriptEngines/libADM_script_tinyPy.so
 %{_libdir}/ADM_plugins6/videoDecoders/libADM_vd_vpx.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffDv.so
@@ -469,14 +417,11 @@
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_png.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_xvid4.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_yv12.so
-%{_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
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_decimate.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_denoise3d.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_denoise3dhq.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_DgBob.so
@@ -485,11 +430,12 @@
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_fadeToBlack.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_FluxSmooth.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_gauss.so
+%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_hflip.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_hzstackField.so
+%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_ivtcDupeRemover.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_kernelDeint.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_largeMedian.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_lavDeint.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_logo.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_lumaOnly.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_mean.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_median.so
@@ -510,13 +456,6 @@
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vflip.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_yadif.so
-%dir %{_datadir}/ADM6_addons
-%dir %{_datadir}/ADM6_addons/avsfilter
-%{_datadir}/ADM6_addons/avsfilter/avsload.exe
-%{_datadir}/ADM6_addons/avsfilter/pipe_source.dll
-%if ! 0%{?sles_version}
-%{_datadir}/pixmaps/avidemux3.png
-%endif
 %{_mandir}/man1/avidemux.1.gz
 %doc AUTHORS COPYING README
 
@@ -533,6 +472,7 @@
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_CropCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_eq2Cli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_HueCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_logoCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_mpdelogoCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_swscaleResize_cli.so
 
@@ -544,10 +484,14 @@
 %{_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/shaderDemo
+%dir %{_libdir}/ADM_plugins6/shaderDemo/1
 %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/shaderDemo/1/bump.shader
+%{_libdir}/ADM_plugins6/shaderDemo/1/lightning.shader
+%{_libdir}/ADM_plugins6/shaderDemo/1/ripple.shader
+%{_libdir}/ADM_plugins6/shaderDemo/1/zigzag.shader
 %{_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
@@ -558,22 +502,22 @@
 %{_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_logoQT%{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_shaderLoaderGl.so
 %{_libdir}/ADM_plugins6/videoFilters/qt%{qtversion}/libADM_vf_swscaleResizeQT%{qtversion}.so
 %{_datadir}/applications/avidemux3-qt%{qtversion}.desktop
+%{_datadir}/pixmaps/avidemux3.png
 
-%files -n avidemux3-qt%{qtversion}-lang
-%defattr(-,root,root)
-%dir %{_datadir}/avidemux3/qt%{qtversion}
-%{_datadir}/avidemux3/qt%{qtversion}/i18n/
-
-%files help
+%files qt%{qtversion}-lang
 %defattr(-,root,root)
 %dir %{_datadir}/avidemux3
-%{_datadir}/avidemux3/help/
+%dir %{_datadir}/avidemux3/qt%{qtversion}
+%dir %{_datadir}/avidemux3/qt%{qtversion}/i18n
+%{_datadir}/avidemux3/qt%{qtversion}/i18n/*.qm
 %endif
 
 %changelog

avidemux-bootStrap.patch Changed

avidemux-cmake-2.8.8.patch Changed

avidemux-cmake-permissions.patch Changed

avidemux-cpu_armel.patch Changed

avidemux-find-lrelease-qt5.patch Deleted

avidemux-linking.patch Changed

@@ -1,6 +1,6 @@
---- avidemux/cli/CMakeLists.txt.orig	2014-11-28 22:27:34.737989374 +0100
-+++ avidemux/cli/CMakeLists.txt	2014-11-28 22:27:19.740246591 +0100
-@@ -80,6 +80,16 @@
+--- avidemux/cli/CMakeLists.txt.orig	2016-08-18 21:32:46.369436856 +0200
++++ avidemux/cli/CMakeLists.txt	2016-08-18 21:32:46.325437648 +0200
+@@ -111,6 +111,16 @@
  )
  
  ###########################################
@@ -17,9 +17,9 @@
  # External libs
  ###########################################
  # gettext
---- avidemux/qt4/CMakeLists.txt.orig	2014-11-28 22:27:34.741989405 +0100
-+++ avidemux/qt4/CMakeLists.txt	2014-11-28 22:27:19.746246489 +0100
-@@ -118,6 +118,16 @@
+--- avidemux/qt4/CMakeLists.txt.orig	2016-08-18 21:32:46.309437935 +0200
++++ avidemux/qt4/CMakeLists.txt	2016-08-18 21:32:45.809446926 +0200
+@@ -161,6 +161,16 @@
  )
  
  ###########################################
@@ -36,8 +36,8 @@
  # External libs
  ###########################################
  # gettext
---- avidemux/qt4/ADM_jobs/src/CMakeLists.txt.orig	2015-02-10 07:29:57.000000000 +0100
-+++ avidemux/qt4/ADM_jobs/src/CMakeLists.txt	2015-02-11 13:46:33.536379900 +0100
+--- avidemux/qt4/ADM_jobs/src/CMakeLists.txt.orig	2016-08-18 21:32:45.845446279 +0200
++++ avidemux/qt4/ADM_jobs/src/CMakeLists.txt	2016-08-18 21:32:45.825446639 +0200
 @@ -67,6 +67,16 @@
  TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreJobs)
  TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreUtils6)

avidemux-package_version.patch Changed

@@ -1,6 +1,6 @@
 diff -uNr avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp.orig avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp
---- avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp.orig	2015-03-07 18:10:59.000000000 +0100
-+++ avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2015-03-07 18:51:50.109120416 +0100
+--- avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp.orig	2016-08-18 21:28:20.890212309 +0200
++++ avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2016-08-18 21:28:38.589893823 +0200
 @@ -143,7 +143,7 @@
      QString referenceFile = QCoreApplication::applicationDirPath() + "/help/" + ((FileAction*)sender())->filePath();
  #else
@@ -10,42 +10,59 @@
  #endif
  
      QDesktopServices::openUrl(QUrl("file:///" + referenceFile, QUrl::TolerantMode));
-diff -uNr avidemux/qt4/ADM_userInterfaces/ui_support.cpp.orig avidemux/qt4/ADM_userInterfaces/ui_support.cpp
---- avidemux/qt4/ADM_userInterfaces/ui_support.cpp.orig	2015-03-07 18:10:59.000000000 +0100
-+++ avidemux/qt4/ADM_userInterfaces/ui_support.cpp	2015-03-07 18:51:50.163119306 +0100
-@@ -104,12 +104,12 @@
-                 
-                 
- #ifdef __APPLE__
--	QString appdir = QCoreApplication::applicationDirPath() + "/../share/avidemux6/"+QString(partialPath.c_str());
-+	QString appdir = QCoreApplication::applicationDirPath() + "/../share/avidemux3/"+QString(partialPath.c_str());
-                 
- #elif defined(_WIN32)
- 	QString appdir = QCoreApplication::applicationDirPath() + QString(partialPath.c_str());
- #else
--	QString appdir = ADM_getInstallRelativePath("share","avidemux6",partialPath.c_str());
-+	QString appdir = ADM_getInstallRelativePath("share","avidemux3",partialPath.c_str());
- #endif
-         QString languageFile=QString(lang);
-     int nbLoaded=0;
-diff -uNr avidemux_core/ADM_core/src/ADM_fileio.cpp.orig avidemux_core/ADM_core/src/ADM_fileio.cpp
---- avidemux_core/ADM_core/src/ADM_fileio.cpp.orig	2015-03-07 18:10:59.000000000 +0100
-+++ avidemux_core/ADM_core/src/ADM_fileio.cpp	2015-03-07 18:51:50.858105023 +0100
-@@ -463,9 +463,9 @@
- 		else
- 			ADM_DIR_NAME = "avidemux";
- #elif defined __HAIKU__
--		const char *ADM_DIR_NAME = "config/settings/avidemux6";
-+		const char *ADM_DIR_NAME = "config/settings/avidemux3";
- #else
--		const char *ADM_DIR_NAME = ".avidemux6";
-+		const char *ADM_DIR_NAME = ".avidemux3";
- #endif
+diff -uNr avidemux_core/ADM_core/src/ADM_folder_linux.cpp.orig avidemux_core/ADM_core/src/ADM_folder_linux.cpp
+--- avidemux_core/ADM_core/src/ADM_folder_linux.cpp.orig	2016-08-18 21:28:19.062245202 +0200
++++ avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2016-08-18 21:28:36.461932112 +0200
+@@ -103,14 +103,14 @@
+     if(isPortable)
+     {
+         std::string i18n=pluginDir;
+-        i18n+=std::string("/../../share/avidemux6/")+flavor+std::string("/i18n/");
++        i18n+=std::string("/../../share/avidemux3/")+flavor+std::string("/i18n/");
+         ADM_i18nDir=canonize(i18n);
+         ADM_info("Relative to install i18n mode : <%s>\n",ADM_i18nDir.c_str());
+         // 181n
+     }else
+     {        
+         std::string partialPath=flavor+std::string("/i18n/");
+-        char *ppath=ADM_getInstallRelativePath("share","avidemux6",partialPath.c_str());
++        char *ppath=ADM_getInstallRelativePath("share","avidemux3",partialPath.c_str());
+         ADM_i18nDir=std::string(ppath);
+         delete  ppath;
+         ppath=NULL;
+@@ -143,7 +143,7 @@
+     strcpy(ADM_basedir, homeEnv);
+     AddSeparator(ADM_basedir);
+ 
+-    const char *ADM_DIR_NAME = ".avidemux6";
++    const char *ADM_DIR_NAME = ".avidemux3";
+ 
+     strcat(ADM_basedir, ADM_DIR_NAME);
+     strcat(ADM_basedir, ADM_SEPARATOR);
+diff -uNr avidemux_core/ADM_core/src/ADM_folder_mac.cpp.orig avidemux_core/ADM_core/src/ADM_folder_mac.cpp
+--- avidemux_core/ADM_core/src/ADM_folder_mac.cpp.orig	2016-08-18 21:28:19.066245131 +0200
++++ avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2016-08-18 21:28:36.465932040 +0200
+@@ -124,7 +124,7 @@
+     strcpy(ADM_basedir, homeEnv);
+     AddSeparator(ADM_basedir);
+ 
+-    const char *ADM_DIR_NAME = ".avidemux6";
++    const char *ADM_DIR_NAME = ".avidemux3";
  
- 		strcat(ADM_basedir, ADM_DIR_NAME);
+     strcat(ADM_basedir, ADM_DIR_NAME);
+     strcat(ADM_basedir, ADM_SEPARATOR);
+@@ -145,7 +145,7 @@
+ {    
+     
+     std::string partialPath=flavor+std::string("/i18n/");
+-    char *ppath=ADM_getInstallRelativePath("../share","avidemux6",partialPath.c_str());
++    char *ppath=ADM_getInstallRelativePath("../share","avidemux3",partialPath.c_str());
+     std::string r=std::string(ppath);
+     delete  ppath;
+     ppath=NULL;
 diff -uNr avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp.orig avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp
---- avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp.orig	2015-03-07 18:10:59.000000000 +0100
-+++ avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2015-03-07 18:51:54.903021895 +0100
+--- avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp.orig	2016-08-18 21:28:16.106298394 +0200
++++ avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2016-08-18 21:28:32.997994441 +0200
 @@ -260,7 +260,7 @@
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1,
  			(string("Executing ") + string(name) + string("...")).c_str());
@@ -56,8 +73,8 @@
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1, "Done");
  
 diff -uNr cmake/se_plugin.cmake.orig cmake/se_plugin.cmake
---- cmake/se_plugin.cmake.orig	2015-03-07 18:10:59.000000000 +0100
-+++ cmake/se_plugin.cmake	2015-03-07 18:51:56.589987225 +0100
+--- cmake/se_plugin.cmake.orig	2016-08-18 21:28:21.774196403 +0200
++++ cmake/se_plugin.cmake	2016-08-18 21:28:39.449878348 +0200
 @@ -15,7 +15,7 @@
  if (WIN32)
      set(helpDir "${CMAKE_INSTALL_PREFIX}/help/${_engineName}")
@@ -68,17 +85,17 @@
  
      install(DIRECTORY "${_sourceDirectory}" DESTINATION "${helpDir}" COMPONENT plugins)
 diff -uNr cmake/sql/update.sh.orig cmake/sql/update.sh
---- cmake/sql/update.sh.orig	2015-03-07 18:10:59.000000000 +0100
-+++ cmake/sql/update.sh	2015-03-07 18:51:56.393991253 +0100
+--- cmake/sql/update.sh.orig	2016-08-18 21:28:21.710197555 +0200
++++ cmake/sql/update.sh	2016-08-18 21:28:39.393879356 +0200
 @@ -1,3 +1,3 @@
 -sqlite3 ~/.avidemux6/jobs.sql .d > dump
 +sqlite3 ~/.avidemux3/jobs.sql .d > dump
  #sql2class -sqlite -global -license -wrapped  -lib $PWD dump
  sql2class -sqlite -build -global -prefix $PWD -lib sqlJobs -namespace db -overwrite dump
 diff -uNr cmake/Ts.cmake.orig cmake/Ts.cmake
---- cmake/Ts.cmake.orig	2015-03-07 18:10:59.000000000 +0100
-+++ cmake/Ts.cmake	2015-03-07 18:51:56.421990678 +0100
-@@ -41,7 +41,7 @@
+--- cmake/Ts.cmake.orig	2016-08-18 21:28:21.558200289 +0200
++++ cmake/Ts.cmake	2016-08-18 21:28:39.249881947 +0200
+@@ -28,7 +28,7 @@
          IF(WIN32)
                  SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")
          ELSE(WIN32)

avidemux-x264_plugins.patch Changed

@@ -1,27 +1,25 @@
---- 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
+--- avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt.orig	2016-08-18 21:32:39.405562081 +0200
++++ avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt	2016-08-18 21:32:38.945570353 +0200
 @@ -27,15 +27,16 @@
      INSTALL_VIDEO_ENCODER_QT4(ADM_ve_x264_${QT_LIBRARY_EXTENSION})
    endif(DO_QT4)
    #-----------------------/QT4 VERSION---------------------
 -  #-----------------------GTK or CLI VERSION---------------------
--  if((DO_GTK) OR (DO_CLI))
++  #-----------------------CLI VERSION----------------------
+   if(DO_COMMON)
 -    ADD_VIDEO_ENCODER(ADM_ve_x264_other   ADM_x264_noui.cpp ${x264_SRCS})
 -    ADD_TARGET_CFLAGS(ADM_ve_x264_other "-DADM_UI_TYPE_BUILD=1") # CLI!
 -    TARGET_LINK_LIBRARIES(ADM_ve_x264_other "${X264_LIBRARY_DIR}")
 -    TARGET_LINK_LIBRARIES(ADM_ve_x264_other ADM_core6)
 -    INIT_VIDEO_ENCODER(ADM_ve_x264_other)
 -    INSTALL_VIDEO_ENCODER(ADM_ve_x264_other)
--  endif((DO_GTK) OR (DO_CLI))
-+  #-----------------------CLI VERSION----------------------
-+  if(DO_CLI)
 +    ADD_VIDEO_ENCODER(ADM_ve_x264_cli   ADM_x264_noui.cpp ${x264_SRCS})
 +    ADD_TARGET_CFLAGS(ADM_ve_x264_cli "-DADM_UI_TYPE_BUILD=1") # CLI!
 +    TARGET_LINK_LIBRARIES(ADM_ve_x264_cli "${X264_LIBRARY_DIR}")
 +    TARGET_LINK_LIBRARIES(ADM_ve_x264_cli ADM_core6)
 +    INIT_VIDEO_ENCODER(ADM_ve_x264_cli)
 +    INSTALL_VIDEO_ENCODER(ADM_ve_x264_cli)
-+  endif(DO_CLI)
+   endif(DO_COMMON)
 +  #-----------------------/CLI VERSION---------------------
    # ------------- PRESET -----------
    if(DO_SETTINGS)

avidemux-x265_plugins.patch Changed

@@ -1,27 +1,25 @@
---- 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
+--- avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt.orig	2016-08-18 21:32:39.473560859 +0200
++++ avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt	2016-08-18 21:32:39.449561290 +0200
 @@ -27,15 +27,16 @@
      INSTALL_VIDEO_ENCODER_QT4(ADM_ve_x265_${QT_LIBRARY_EXTENSION})
    endif(DO_QT4)
    #-----------------------/QT4 VERSION---------------------
 -  #-----------------------GTK or CLI VERSION---------------------
--  if((DO_GTK) OR (DO_CLI))
++  #-----------------------CLI VERSION----------------------
+   if(DO_COMMON)
 -    ADD_VIDEO_ENCODER(ADM_ve_x265_other   ADM_x265_noui.cpp ${x265_SRCS})
 -    ADD_TARGET_CFLAGS(ADM_ve_x265_other "-DADM_UI_TYPE_BUILD=1") # CLI!
 -    TARGET_LINK_LIBRARIES(ADM_ve_x265_other "${X265_LIBRARY_DIR}")
 -    TARGET_LINK_LIBRARIES(ADM_ve_x265_other ADM_core6)
 -    INIT_VIDEO_ENCODER(ADM_ve_x265_other)
 -    INSTALL_VIDEO_ENCODER(ADM_ve_x265_other)
--  endif((DO_GTK) OR (DO_CLI))
-+  #-----------------------CLI VERSION----------------------
-+  if(DO_CLI)
 +    ADD_VIDEO_ENCODER(ADM_ve_x265_cli   ADM_x265_noui.cpp ${x265_SRCS})
 +    ADD_TARGET_CFLAGS(ADM_ve_x265_cli "-DADM_UI_TYPE_BUILD=1") # CLI!
 +    TARGET_LINK_LIBRARIES(ADM_ve_x265_cli "${X265_LIBRARY_DIR}")
 +    TARGET_LINK_LIBRARIES(ADM_ve_x265_cli ADM_core6)
 +    INIT_VIDEO_ENCODER(ADM_ve_x265_cli)
 +    INSTALL_VIDEO_ENCODER(ADM_ve_x265_cli)
-+  endif(DO_CLI)
+   endif(DO_COMMON)
 +  #-----------------------/CLI VERSION---------------------
    # ------------- PRESET -----------
    if(DO_SETTINGS)

config.mak.diff Changed

libavcodec_avcodec.h.patch Deleted

@@ -1,29 +0,0 @@
---- libavcodec/avcodec.h.orig	2015-09-10 16:03:09.110337744 +0200
-+++ libavcodec/avcodec.h	2015-09-10 16:03:09.132337918 +0200
-@@ -1008,6 +1008,10 @@
- #define CODEC_FLAG2_DROP_FRAME_TIMECODE AV_CODEC_FLAG2_DROP_FRAME_TIMECODE
- #define CODEC_FLAG2_IGNORE_CROP   AV_CODEC_FLAG2_IGNORE_CROP
- 
-+//MEANX: NEVER EVER USE CLOSED GOP ?
-+#define CODEC_FLAG2_32_PULLDOWN   0x80000000
-+// /MEANX
-+
- #define CODEC_FLAG2_CHUNKS        AV_CODEC_FLAG2_CHUNKS
- #define CODEC_FLAG2_SHOW_ALL      AV_CODEC_FLAG2_SHOW_ALL
- #define CODEC_FLAG2_EXPORT_MVS    AV_CODEC_FLAG2_EXPORT_MVS
-@@ -2579,6 +2583,7 @@
-      * - decoding: unused
-      */
-     int rc_buffer_size;
-+    int rc_buffer_size_header;  /*< That one is set in the header MEANX*/
- 
-     /**
-      * ratecontrol override, see RcOverride
-@@ -2602,6 +2607,7 @@
-      * - decoding: Set by user, may be overwritten by libavcodec.
-      */
-     int rc_max_rate;
-+    int rc_max_rate_header; /*< That one is set in the header MEANX */
- 
-     /**
-      * minimum bitrate

libavcodec_mpeg12enc.c.patch Deleted

@@ -1,157 +0,0 @@
---- libavcodec/mpeg12enc.c.orig	2015-09-10 16:03:12.576365227 +0200
-+++ libavcodec/mpeg12enc.c	2015-09-10 16:03:12.615365537 +0200
-@@ -256,6 +256,7 @@
-         put_sbits(&s->pb, 12, s->width  & 0xFFF);
-         put_sbits(&s->pb, 12, s->height & 0xFFF);
- 
-+#if 0 // MEANX
-         for (i = 1; i < 15; i++) {
-             int64_t error = aspect_ratio.num * (1LL<<32) / aspect_ratio.den;
-             if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO || i <= 1)
-@@ -271,11 +272,40 @@
-             }
-         }
- 
--        put_bits(&s->pb, 4, s->aspect_ratio_info);
--        put_bits(&s->pb, 4, s->frame_rate_index);
--
--        if (s->avctx->rc_max_rate) {
--            v = (s->avctx->rc_max_rate + 399) / 400;
-+#endif // MEANX
-+            // MEANX put_bits(&s->pb, 4, s->aspect_ratio_info);
-+            // MEANX put_bits(&s->pb, 4, s->frame_rate_index);
-+ // MEANX 4:3
-+   if(s->avctx->sample_aspect_ratio.num==16 && s->avctx->sample_aspect_ratio.den==9)
-+             {
-+                 //printf("FFmpeg : Wide\n");
-+                 put_bits(&s->pb,4,3); //16:9
-+             }
-+             else        //4:3
-+             {
-+               if(s->codec_id == CODEC_ID_MPEG2VIDEO)
-+                 put_bits(&s->pb, 4, 2);
-+               else
-+                 put_bits(&s->pb, 4, 12); // MPEG1
-+             }
-+ // /MEANX
-+// MEANX : Pulldown
-+            if((s->avctx->flags2 & CODEC_FLAG2_32_PULLDOWN) && (s->codec_id == CODEC_ID_MPEG2VIDEO))
-+             {           
-+                 put_bits(&s->pb, 4,4);
-+             }
-+             else
-+             {                                  
-+                 put_bits(&s->pb, 4, s->frame_rate_index);
-+             } //MEANX pulldown
-+
-+            // MEANX if(s->avctx->rc_max_rate){
-+                // MEANX v = (s->avctx->rc_max_rate + 399) / 400;
-+           // MEANX  if(s->avctx->rc_max_rate_header){ //MEANX we use header
-+           // MEANX      v = (s->avctx->rc_max_rate_header + 399) / 400;
-+            if(s->avctx->rc_buffer_size_header) // MEANX we use header
-+            {
-+                vbv_buffer_size = s->avctx->rc_buffer_size_header;
-             if (v > 0x3ffff && s->codec_id == AV_CODEC_ID_MPEG1VIDEO)
-                 v = 0x3ffff;
-         } else {
-@@ -325,7 +355,19 @@
-             put_bits(&s->pb, 3, s->avctx->profile); // profile
-             put_bits(&s->pb, 4, s->avctx->level);   // level
- 
--            put_bits(&s->pb, 1, s->progressive_sequence);
-+   // MEANX pulldown put_bits(&s->pb, 1, s->progressive_sequence);
-+  // MEANX Pulldown
-+ if(s->avctx->flags2 & CODEC_FLAG2_32_PULLDOWN) //MEANX
-+                        put_bits(&s->pb, 1, 0);
-+                else
-+                        put_bits(&s->pb, 1, s->progressive_sequence);
-+
-+
-+// /MEANX
-+
-+
-+
-+// MEANX                 put_bits(&s->pb, 1, s->progressive_sequence);
-             put_bits(&s->pb, 2, s->chroma_format);
-             put_bits(&s->pb, 2, s->width  >> 12);
-             put_bits(&s->pb, 2, s->height >> 12);
-@@ -427,6 +469,7 @@
- 
- void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number)
- {
-+    int tff, rff; //MEANX
-     AVFrameSideData *side_data;
-     mpeg1_encode_sequence_header(s);
- 
-@@ -465,6 +508,46 @@
- 
-     s->frame_pred_frame_dct = 1;
-     if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
-+// MEANX
-+        if(s->avctx->flags2 & CODEC_FLAG2_32_PULLDOWN)
-+        {
-+        
-+                switch((s->picture_number - 
-+                          s->gop_picture_number)&3)
-+                {
-+                        case 0:
-+                        default:
-+                                rff=1;
-+                                tff=1;
-+                                break;
-+                        case 1:
-+                                rff=0;
-+                                tff=0;
-+                                break;
-+                        case 2:
-+                                rff=1;
-+                                tff=0;
-+                                break;
-+                        case 3:
-+                                rff=0;
-+                                tff=1;
-+                                break;
-+                }               
-+           }
-+        else
-+        {
-+                if (s->progressive_sequence) 
-+                {
-+                        tff=0; /* no repeat */
-+                } else 
-+                {
-+                        tff=s->current_picture_ptr->f->top_field_first;
-+                }
-+                rff=s->repeat_first_field;
-+        
-+        }
-+
-+// /MEANX
-         put_header(s, EXT_START_CODE);
-         put_bits(&s->pb, 4, 8);                 /* pic ext */
-         if (s->pict_type == AV_PICTURE_TYPE_P ||
-@@ -484,10 +567,14 @@
- 
-         av_assert0(s->picture_structure == PICT_FRAME);
-         put_bits(&s->pb, 2, s->picture_structure);
-+#if 0 // MEANX
-         if (s->progressive_sequence)
-             put_bits(&s->pb, 1, 0);             /* no repeat */
-         else
-             put_bits(&s->pb, 1, s->current_picture_ptr->f->top_field_first);
-+#endif // MEANX
-+        put_bits(&s->pb, 1, tff);  //MEANX PULLDOWN
-+
-         /* XXX: optimize the generation of this flag with entropy measures */
-         s->frame_pred_frame_dct = s->progressive_sequence;
- 
-@@ -496,7 +583,8 @@
-         put_bits(&s->pb, 1, s->q_scale_type);
-         put_bits(&s->pb, 1, s->intra_vlc_format);
-         put_bits(&s->pb, 1, s->alternate_scan);
--        put_bits(&s->pb, 1, s->repeat_first_field);
-+        // MEANX put_bits(&s->pb, 1, s->top_field_first);
-+        put_bits(&s->pb, 1, rff); // MEANX
-         s->progressive_frame = s->progressive_sequence;
-         /* chroma_420_type */
-         put_bits(&s->pb, 1, s->chroma_format ==

libavcodec_mpegvideo_enc.c.patch Deleted

@@ -1,37 +0,0 @@
---- libavcodec/mpegvideo_enc.c.orig	2015-09-10 21:42:19.055613989 +0200
-+++ libavcodec/mpegvideo_enc.c	2015-09-10 21:42:19.096613316 +0200
-@@ -498,14 +498,14 @@
-                "Warning vbv_delay will be set to 0xFFFF (=VBR) as the "
-                "specified vbv buffer is too large for the given bitrate!\n");
-     }
--
-+#if 0 // MEANX
-     if ((s->avctx->flags & AV_CODEC_FLAG_4MV) && s->codec_id != AV_CODEC_ID_MPEG4 &&
-         s->codec_id != AV_CODEC_ID_H263 && s->codec_id != AV_CODEC_ID_H263P &&
-         s->codec_id != AV_CODEC_ID_FLV1) {
-         av_log(avctx, AV_LOG_ERROR, "4MV not supported by codec\n");
-         return -1;
-     }
--
-+#endif
-     if (s->obmc && s->avctx->mb_decision != FF_MB_DECISION_SIMPLE) {
-         av_log(avctx, AV_LOG_ERROR,
-                "OBMC is only supported with simple mb decision\n");
-@@ -597,7 +597,7 @@
-         av_log(avctx, AV_LOG_ERROR, "interlacing not supported by codec\n");
-         return -1;
-     }
--
-+#if 0 // MEANX
-     // FIXME mpeg2 uses that too
-     if (s->mpeg_quant && (   s->codec_id != AV_CODEC_ID_MPEG4
-                           && s->codec_id != AV_CODEC_ID_MPEG2VIDEO)) {
-@@ -605,7 +605,7 @@
-                "mpeg2 style quantization not supported by codec\n");
-         return -1;
-     }
--
-+#endif
-     if ((s->mpv_flags & FF_MPV_FLAG_CBP_RD) && !avctx->trellis) {
-         av_log(avctx, AV_LOG_ERROR, "CBP RD needs trellis quant\n");
-         return -1;

libavcodec_nvenc.patch Deleted

@@ -1,143 +0,0 @@
---- libavcodec/nvenc.c.orig	2015-09-10 16:03:16.151393593 +0200
-+++ libavcodec/nvenc.c	2015-09-10 16:03:16.198393966 +0200
-@@ -960,19 +960,19 @@
- 
-         switch (avctx->pix_fmt) {
-         case AV_PIX_FMT_YUV420P:
--            allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_YV12_PL;
--            break;
-+            //allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_YV12_PL;
-+            //break;
- 
-         case AV_PIX_FMT_NV12:
-             allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_NV12_PL;
-             break;
- 
--        case AV_PIX_FMT_YUV444P:
--            allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_YUV444_PL;
--            break;
-+        //case AV_PIX_FMT_YUV444P:
-+            //allocSurf.bufferFmt = NV_ENC_BUFFER_FORMAT_YUV444_PL;
-+            //break;
- 
-         default:
--            av_log(avctx, AV_LOG_FATAL, "Invalid input pixel format\n");
-+            av_log(avctx, AV_LOG_FATAL, "NVENC: Invalid input pixel format\n");
-             res = AVERROR(EINVAL);
-             goto error;
-         }
-@@ -1198,6 +1198,28 @@
- 
-     return res;
- }
-+/**
-+        MEANX
-+*/
-+static void interleave_nv12(unsigned char *dest, int dest_stride,unsigned char *u,int u_stride,unsigned char *v,int v_stride,int width, int height)
-+{
-+        int x,y;
-+        unsigned char *d;
-+        unsigned char *pu;
-+        unsigned char *pv;
-+        for(y=0;y<height;y++)
-+        {
-+                d=dest;dest+=dest_stride;
-+                pu=u;u+=u_stride;
-+                pv=v;v+=v_stride;
-+                for(x=0;x<width;x++)
-+                {
-+                        *(d++)=*(pu++);
-+                        *(d++)=*(pv++);
-+                }
-+
-+        }
-+} 
- 
- static int nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
-     const AVFrame *frame, int *got_packet)
-@@ -1235,62 +1257,33 @@
-         if (nv_status != NV_ENC_SUCCESS) {
-             av_log(avctx, AV_LOG_ERROR, "Failed locking nvenc input buffer\n");
-             return 0;
--        }
--
--        if (avctx->pix_fmt == AV_PIX_FMT_YUV420P) {
--            uint8_t *buf = lockBufferParams.bufferDataPtr;
--
--            av_image_copy_plane(buf, lockBufferParams.pitch,
--                frame->data0, frame->linesize0,
--                avctx->width, avctx->height);
--
--            buf += inSurf->height * lockBufferParams.pitch;
--
--            av_image_copy_plane(buf, lockBufferParams.pitch >> 1,
--                frame->data2, frame->linesize2,
--                avctx->width >> 1, avctx->height >> 1);
--
--            buf += (inSurf->height * lockBufferParams.pitch) >> 2;
-+        }  
-+        { 
-+        uint8_t *buf = lockBufferParams.bufferDataPtr;
- 
--            av_image_copy_plane(buf, lockBufferParams.pitch >> 1,
--                frame->data1, frame->linesize1,
--                avctx->width >> 1, avctx->height >> 1);
--        } else if (avctx->pix_fmt == AV_PIX_FMT_NV12) {
--            uint8_t *buf = lockBufferParams.bufferDataPtr;
--
--            av_image_copy_plane(buf, lockBufferParams.pitch,
-+        av_image_copy_plane(buf, lockBufferParams.pitch,
-                 frame->data0, frame->linesize0,
-                 avctx->width, avctx->height);
-+// MEANX : We accept YV12 and interleave while copying, it saves us one intermediate image buffer
-+        buf += inSurf->height * lockBufferParams.pitch;
-+        switch(avctx->pix_fmt)
-+        {
-+                case AV_PIX_FMT_YUV420P:
-+                        // Interleave U & V to NV12
-+                        interleave_nv12(buf, lockBufferParams.pitch,frame->data1,frame->linesize1,frame->data2,frame->linesize2,avctx->width>>1, avctx->height>>1); 
-+                        break;
-+
-+                case AV_PIX_FMT_NV12:
-+                        av_image_copy_plane(buf, lockBufferParams.pitch,
-+                                frame->data1, frame->linesize1,
-+                                avctx->width, avctx->height >> 1);
-+                        break;
-+                default:
-+                        av_log(avctx, AV_LOG_FATAL, "NVENC: Invalid pixel format!\n");
-+                        return AVERROR(EINVAL);
- 
--            buf += inSurf->height * lockBufferParams.pitch;
--
--            av_image_copy_plane(buf, lockBufferParams.pitch,
--                frame->data1, frame->linesize1,
--                avctx->width, avctx->height >> 1);
--        } else if (avctx->pix_fmt == AV_PIX_FMT_YUV444P) {
--            uint8_t *buf = lockBufferParams.bufferDataPtr;
--
--            av_image_copy_plane(buf, lockBufferParams.pitch,
--                frame->data0, frame->linesize0,
--                avctx->width, avctx->height);
--
--            buf += inSurf->height * lockBufferParams.pitch;
--
--            av_image_copy_plane(buf, lockBufferParams.pitch,
--                frame->data1, frame->linesize1,
--                avctx->width, avctx->height);
--
--            buf += inSurf->height * lockBufferParams.pitch;
--
--            av_image_copy_plane(buf, lockBufferParams.pitch,
--                frame->data2, frame->linesize2,
--                avctx->width, avctx->height);
--        } else {
--            av_log(avctx, AV_LOG_FATAL, "Invalid pixel format!\n");
--            return AVERROR(EINVAL);
--        }
--
--        nv_status = p_nvenc->nvEncUnlockInputBuffer(ctx->nvencoder, inSurf->input_surface);
-+       }
-+       nv_status = p_nvenc->nvEncUnlockInputBuffer(ctx->nvencoder, inSurf->input_surface);
-         if (nv_status != NV_ENC_SUCCESS) {
-             av_log(avctx, AV_LOG_FATAL, "Failed unlocking input buffer!\n");
-             return AVERROR_EXTERNAL;

libavcodec_put_bits.h.patch Deleted

libavcodec_x86_fmtconvert_init.c.patch Deleted

xvba_support_from_xbmc_xvba.patch Deleted

@@ -1,854 +0,0 @@
-diff --git a/configure b/configure
-index d557cac..ba1f392 100755
---- a/configure
-+++ b/configure
-@@ -144,6 +144,7 @@
-   --disable-vaapi          disable VAAPI code autodetect
-   --enable-vda             enable VDA code
-   --disable-vdpau          disable VDPAU code autodetect
-+  --disable-xvba           disable XVBA code
- 
- Individual component options:
-   --disable-everything     disable all components listed below
-@@ -1216,6 +1217,7 @@
-     vaapi
-     vda
-     vdpau
-+    xvba
- "
- 
- LIBRARY_LIST="
-@@ -1845,6 +1847,7 @@
- dxva2_deps="dxva2api_h"
- vaapi_deps="va_va_h"
- vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"
-+xvba_deps="amd_amdxvba_h"
- vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore"
- vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
- 
-@@ -1865,6 +1868,8 @@
- h264_vdpau_decoder_select="h264_decoder"
- h264_vdpau_hwaccel_deps="vdpau"
- h264_vdpau_hwaccel_select="h264_decoder"
-+h264_xvba_hwaccel_select="h264_decoder"
-+h264_xvba_hwaccel_deps="xvba"
- mpeg_vdpau_decoder_deps="vdpau"
- mpeg_vdpau_decoder_select="mpegvideo_decoder"
- mpeg1_vdpau_decoder_deps="vdpau"
-@@ -1877,6 +1882,8 @@
- mpeg2_vaapi_hwaccel_deps="vaapi"
- mpeg2_vaapi_hwaccel_select="mpeg2video_decoder"
- mpeg2_vdpau_hwaccel_deps="vdpau"
-+mpeg2_xvba_hwaccel_select="mpeg2video_decoder"
-+mpeg2_xvba_hwaccel_deps="xvba"
- mpeg2_vdpau_hwaccel_select="mpeg2video_decoder"
- mpeg4_crystalhd_decoder_select="crystalhd"
- mpeg4_vaapi_hwaccel_deps="vaapi"
-@@ -1895,11 +1902,14 @@
- vc1_vdpau_decoder_select="vc1_decoder"
- vc1_vdpau_hwaccel_deps="vdpau"
- vc1_vdpau_hwaccel_select="vc1_decoder"
-+vc1_xvba_hwaccel_select="vc1_decoder"
-+vc1_xvba_hwaccel_deps="xvba"
- wmv3_crystalhd_decoder_select="crystalhd"
- wmv3_dxva2_hwaccel_select="vc1_dxva2_hwaccel"
- wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
- wmv3_vdpau_decoder_select="vc1_vdpau_decoder"
- wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
-+wmv3_xvba_hwaccel_select="vc1_xvba_hwaccel"
- 
- # parsers
- h264_parser_select="golomb h264chroma h264dsp h264pred h264qpel videodsp"
-@@ -3853,6 +3863,7 @@
- check_header unistd.h
- check_header vdpau/vdpau.h
- check_header vdpau/vdpau_x11.h
-+check_header amd/amdxvba.h
- check_header VideoDecodeAcceleration/VDADecoder.h
- check_header windows.h
- check_header X11/extensions/XvMClib.h
-diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index dc065a5..c386923 100644
---- a/libavcodec/Makefile
-+++ b/libavcodec/Makefile
-@@ -12,6 +12,7 @@ HEADERS = avcodec.h                                                     \
-           vdpau.h                                                       \
-           version.h                                                     \
-           xvmc.h                                                        \
-+          xvba.h                                                        \
- 
- OBJS = allcodecs.o                                                      \
-        audioconvert.o                                                   \
-@@ -73,6 +74,7 @@ OBJS-$(CONFIG_SHARED)                  += log2_tab.o
- OBJS-$(CONFIG_SINEWIN)                 += sinewin.o
- OBJS-$(CONFIG_VAAPI)                   += vaapi.o
- OBJS-$(CONFIG_VDPAU)                   += vdpau.o
-+OBJS-$(CONFIG_XVBA)                    += xvba.o
- OBJS-$(CONFIG_VIDEODSP)                += videodsp.o
- OBJS-$(CONFIG_VP3DSP)                  += vp3dsp.o
- 
-@@ -232,6 +234,7 @@ OBJS-$(CONFIG_H264_VAAPI_HWACCEL)      += vaapi_h264.o
- OBJS-$(CONFIG_H264_VDA_HWACCEL)        += vda_h264.o
- OBJS-$(CONFIG_H264_VDA_DECODER)        += vda_h264_dec.o
- OBJS-$(CONFIG_H264_VDPAU_HWACCEL)      += vdpau_h264.o
-+OBJS-$(CONFIG_H264_XVBA_HWACCEL)       += xvba_h264.o
- OBJS-$(CONFIG_HUFFYUV_DECODER)         += huffyuv.o huffyuvdec.o
- OBJS-$(CONFIG_HUFFYUV_ENCODER)         += huffyuv.o huffyuvenc.o
- OBJS-$(CONFIG_IAC_DECODER)             += imc.o
-@@ -295,6 +298,7 @@ OBJS-$(CONFIG_MPEG1VIDEO_ENCODER)      += mpeg12enc.o mpeg12.o          \
- OBJS-$(CONFIG_MPEG2_DXVA2_HWACCEL)     += dxva2_mpeg2.o
- OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL)     += vaapi_mpeg2.o
- OBJS-$(CONFIG_MPEG2_VDPAU_HWACCEL)     += vdpau_mpeg12.o
-+OBJS-$(CONFIG_MPEG2_XVBA_HWACCEL)      += xvba_mpeg2.o
- OBJS-$(CONFIG_MPEG2VIDEO_DECODER)      += mpeg12.o mpeg12data.o
- OBJS-$(CONFIG_MPEG2VIDEO_ENCODER)      += mpeg12enc.o mpeg12.o          \
-                                           timecode.o
-@@ -459,6 +463,7 @@ OBJS-$(CONFIG_VC1_DECODER)             += vc1dec.o vc1.o vc1data.o vc1dsp.o \
- OBJS-$(CONFIG_VC1_DXVA2_HWACCEL)       += dxva2_vc1.o
- OBJS-$(CONFIG_VC1_VAAPI_HWACCEL)       += vaapi_vc1.o
- OBJS-$(CONFIG_VC1_VDPAU_HWACCEL)       += vdpau_vc1.o
-+OBJS-$(CONFIG_VC1_XVBA_HWACCEL)        += xvba_vc1.o
- OBJS-$(CONFIG_VCR1_DECODER)            += vcr1.o
- OBJS-$(CONFIG_VMDAUDIO_DECODER)        += vmdav.o
- OBJS-$(CONFIG_VMDVIDEO_DECODER)        += vmdav.o
-@@ -788,6 +793,7 @@ SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
- SKIPHEADERS-$(CONFIG_LIBUTVIDEO)       += libutvideo.h
- SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
- SKIPHEADERS-$(CONFIG_VAAPI)            += vaapi_internal.h
-+SKIPHEADERS-$(CONFIG_XVBA)             += xvba_internal.h
- SKIPHEADERS-$(CONFIG_VDA)              += vda.h
- SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h
- SKIPHEADERS-$(HAVE_OS2THREADS)         += os2threads.h
-diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
-index 584446f..7a8f61c 100644
---- a/libavcodec/allcodecs.c
-+++ b/libavcodec/allcodecs.c
-@@ -79,18 +79,22 @@ void avcodec_register_all(void)
-     REGISTER_HWACCEL(H264_VAAPI,        h264_vaapi);
-     REGISTER_HWACCEL(H264_VDA,          h264_vda);
-     REGISTER_HWACCEL(H264_VDPAU,        h264_vdpau);
-+    REGISTER_HWACCEL(H264_XVBA,         h264_xvba);
-     REGISTER_HWACCEL(MPEG1_VDPAU,       mpeg1_vdpau);
-     REGISTER_HWACCEL(MPEG2_DXVA2,       mpeg2_dxva2);
-     REGISTER_HWACCEL(MPEG2_VAAPI,       mpeg2_vaapi);
-     REGISTER_HWACCEL(MPEG2_VDPAU,       mpeg2_vdpau);
-+    REGISTER_HWACCEL(MPEG2_XVBA,        mpeg2_xvba);
-     REGISTER_HWACCEL(MPEG4_VAAPI,       mpeg4_vaapi);
-     REGISTER_HWACCEL(MPEG4_VDPAU,       mpeg4_vdpau);
-     REGISTER_HWACCEL(VC1_DXVA2,         vc1_dxva2);
-     REGISTER_HWACCEL(VC1_VAAPI,         vc1_vaapi);
-     REGISTER_HWACCEL(VC1_VDPAU,         vc1_vdpau);
-+    REGISTER_HWACCEL(VC1_XVBA,          vc1_xvba);
-     REGISTER_HWACCEL(WMV3_DXVA2,        wmv3_dxva2);
-     REGISTER_HWACCEL(WMV3_VAAPI,        wmv3_vaapi);
-     REGISTER_HWACCEL(WMV3_VDPAU,        wmv3_vdpau);
-+    REGISTER_HWACCEL(WMV3_XVBA,         wmv3_xvba);
- 
-     /* video codecs */
-     REGISTER_ENCODER(A64MULTI,          a64multi);
-diff --git a/libavcodec/h264.c b/libavcodec/h264.c
-index 3a83b4b..96b6c30 100644
---- a/libavcodec/h264.c
-+++ b/libavcodec/h264.c
-@@ -81,6 +81,9 @@ static const enum AVPixelFormat h264_hwaccel_pixfmt_list_420 = {
- #if CONFIG_H264_VDPAU_HWACCEL
-     AV_PIX_FMT_VDPAU,
- #endif
-+#if CONFIG_H264_XVBA_HWACCEL
-+    AV_PIX_FMT_XVBA_VLD,
-+#endif
-     AV_PIX_FMT_YUV420P,
-     AV_PIX_FMT_NONE
- };
-diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
-index 2130c74..4d611f9 100644
---- a/libavcodec/vc1dec.c
-+++ b/libavcodec/vc1dec.c
-@@ -5807,6 +5807,9 @@ static const enum AVPixelFormat vc1_hwaccel_pixfmt_list_420 = {
- #if CONFIG_VDPAU
-     AV_PIX_FMT_VDPAU,
- #endif
-+#if CONFIG_XVBA
-+    AV_PIX_FMT_XVBA_VLD,
-+#endif
-     AV_PIX_FMT_YUV420P,
-     AV_PIX_FMT_NONE
- };
-diff --git a/libavcodec/xvba.c b/libavcodec/xvba.c
-new file mode 100644
-index 0000000..c6ff2fe
---- /dev/null
-+++ b/libavcodec/xvba.c
-@@ -0,0 +1,77 @@
-+/*
-+ * HW decode acceleration for MPEG-2, H.264 and VC-1
-+ *
-+ * Copyright (C) 2005-2011 Team XBMC
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+
-+/**
-+ * \addtogroup XVBA_Decoding
-+ *
-+ * @{
-+ */
-+
-+#include <stdint.h>
-+#include "xvba.h"
-+#include "xvba_internal.h"
-+#include "avcodec.h"
-+#include "mpegvideo.h"
-+
-+int ff_xvba_translate_profile(int profile) {
-+
-+  if (profile == 66)
-+    return 1;
-+  else if (profile == 77)
-+    return 2;
-+  else if (profile == 100)
-+    return 3;
-+  else if (profile == 0)
-+    return 4;
-+  else if (profile == 1)
-+    return 5;
-+  else if (profile == 3)
-+    return 6;
-+  else
-+    return -1;
-+}
-+
-+// See page 25 of the documentation
-+int ff_xvba_translate_picture_structure(int picture_structure) {
-+  if(picture_structure == PICT_BOTTOM_FIELD)
-+    return 0;
-+  else if (picture_structure == PICT_TOP_FIELD)
-+    return 1;
-+  else //PICT_FRAME by default
-+    return 3;
-+}
-+
-+void ff_xvba_add_slice_data(struct xvba_render_state *render, const uint8_t *buffer, uint32_t size) {
-+
-+  render->buffers = av_fast_realloc(
-+         render->buffers,
-+         &render->buffers_alllocated,
-+         sizeof(struct xvba_bitstream_buffers)*(render->num_slices + 1)
-+  );
-+
-+  render->buffersrender->num_slices.buffer = buffer;
-+  render->buffersrender->num_slices.size = size;
-+
-+  render->num_slices++;
-+}
-+
-diff --git a/libavcodec/xvba.h b/libavcodec/xvba.h
-new file mode 100644
-index 0000000..e590faf
---- /dev/null
-+++ b/libavcodec/xvba.h
-@@ -0,0 +1,72 @@
-+/*
-+ * HW decode acceleration for MPEG-2, H.264 and VC-1
-+ *
-+ * Copyright (C) 2005-2011 Team XBMC
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_XVBA_H
-+#define AVCODEC_XVBA_H
-+
-+#include <stdint.h>
-+#include <X11/Xlib.h>
-+#include <amd/amdxvba.h>
-+
-+
-+/**
-+ * \defgroup XVBA_Decoding VA API Decoding
-+ * \ingroup Decoder
-+ * @{
-+ */
-+
-+/** \brief The videoSurface is used for rendering. */
-+#define FF_XVBA_STATE_USED_FOR_RENDER 1
-+
-+/**
-+ * \brief The videoSurface is needed for reference/prediction.
-+ * The codec manipulates this.
-+ */
-+#define FF_XVBA_STATE_USED_FOR_REFERENCE 2
-+
-+/**
-+ * \brief The videoSurface holds a decoded frame.
-+ * The codec manipulates this.
-+ */
-+#define FF_XVBA_STATE_DECODED 4
-+
-+/* @} */
-+
-+struct xvba_bitstream_buffers
-+{
-+  const void *buffer;
-+  unsigned int size;
-+};
-+
-+struct xvba_render_state {
-+
-+  int state; ///< Holds FF_XVBA_STATE_* values.
-+  void *surface;
-+  XVBAPictureDescriptor *picture_descriptor;
-+  XVBAQuantMatrixAvc *iq_matrix;
-+  unsigned int num_slices;
-+  struct xvba_bitstream_buffers *buffers;
-+  uint32_t buffers_alllocated;
-+  int psf;
-+};
-+
-+#endif /* AVCODEC_XVBA_H */
-diff --git a/libavcodec/xvba_h264.c b/libavcodec/xvba_h264.c
-new file mode 100644
-index 0000000..20ba2f2
---- /dev/null
-+++ b/libavcodec/xvba_h264.c
-@@ -0,0 +1,194 @@
-+/*
-+ * H.264 HW decode acceleration through XVBA
-+ *
-+ * Copyright (C) 2005-2011 Team XBMC
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#include "xvba.h"
-+#include "xvba_internal.h"
-+#include "h264.h"
-+#include <assert.h>
-+
-+/** @file
-+ *  This file implements the glue code between FFmpeg's and XvBA API's
-+ *  structures for H.264 decoding.
-+ */
-+
-+
-+/** Initialize and start decoding a frame with XVBA. */
-+static int start_frame(AVCodecContext          *avctx,
-+                       av_unused const uint8_t *buffer,
-+                       av_unused uint32_t       size)
-+{
-+  H264Context * const h = avctx->priv_data;
-+  struct xvba_render_state *render;
-+  XVBAPictureDescriptor *pic_descriptor;
-+  int i;
-+
-+  render = (struct xvba_render_state *)h->cur_pic_ptr->f.data0;
-+  assert(render);
-+
-+  if (render->picture_descriptor == 0)
-+    return -1;
-+
-+  pic_descriptor = render->picture_descriptor;
-+
-+  for (i = 0; i < 2; ++i) {
-+      int foc = h->cur_pic_ptr->field_poci;
-+      if (foc == INT_MAX)
-+          foc = 0;
-+      pic_descriptor->avc_curr_field_order_cnt_listi = foc;
-+  }
-+
-+  pic_descriptor->avc_frame_num = h->frame_num;
-+
-+  render->num_slices = 0;
-+
-+  return 0;
-+}
-+
-+/** End a hardware decoding based frame. */
-+static int end_frame(AVCodecContext *avctx)
-+{
-+  H264Context * const h = avctx->priv_data;
-+  struct xvba_render_state *render;
-+  XVBAPictureDescriptor *pic_descriptor;
-+  XVBAQuantMatrixAvc *iq_matrix;
-+
-+  render = (struct xvba_render_state *)h->cur_pic_ptr->f.data0;
-+  assert(render);
-+
-+  if (render->picture_descriptor == 0 || render->iq_matrix == 0)
-+    return -1;
-+
-+  pic_descriptor = render->picture_descriptor;
-+  iq_matrix = render->iq_matrix;
-+
-+  av_dlog(avctx, "end_frame()\n");
-+
-+  /* Fill in Picture Parameters*/
-+  pic_descriptor->profile                                     = ff_xvba_translate_profile(avctx->profile);
-+  pic_descriptor->level                                       = avctx->level;
-+  pic_descriptor->width_in_mb                                 = h->mb_width;
-+  pic_descriptor->height_in_mb                                = h->mb_height;
-+
-+  pic_descriptor->picture_structure                           = ff_xvba_translate_picture_structure(h->picture_structure);
-+
-+  pic_descriptor->chroma_format                               = h->chroma_format_idc ? h->chroma_format_idc : 1;
-+  pic_descriptor->avc_intra_flag                              = (h->slice_type == AV_PICTURE_TYPE_I) ? 1 : 0;
-+  pic_descriptor->avc_reference                               = (h->cur_pic_ptr->f.reference & 3) ? 1 : 0;
-+
-+  pic_descriptor->avc_bit_depth_luma_minus8                   = h->sps.bit_depth_luma - 8;
-+  pic_descriptor->avc_bit_depth_chroma_minus8                 = h->sps.bit_depth_chroma - 8;
-+  pic_descriptor->avc_log2_max_frame_num_minus4               = h->sps.log2_max_frame_num -4;
-+  pic_descriptor->avc_pic_order_cnt_type                      = h->sps.poc_type;
-+  pic_descriptor->avc_log2_max_pic_order_cnt_lsb_minus4       = h->sps.log2_max_poc_lsb - 4;
-+  pic_descriptor->avc_num_ref_frames                          = h->sps.ref_frame_count;
-+  pic_descriptor->avc_reserved_8bit                           = 0;
-+
-+  /* Set a level that can decode stuff in every case without a lookup table 
-+     xvba seems to have problems only when the number of Reframes goes beyond
-+     the max support number of Level4.1@High. So in praxis decoding a Level 3.0
-+     file that in deed has level4.1@High specs does not matter. We use this fact
-+     and check if the ref_frames stay in the range Level4.1@high can decode if
-+     not, we set Level5.1 */
-+  if (pic_descriptor->avc_num_ref_frames > 4) {
-+    const unsigned int mbw = pic_descriptor->width_in_mb;
-+    const unsigned int mbh = pic_descriptor->height_in_mb;
-+    // this matches Level4.1@High stats to differ between <= 4.1 and 5.1
-+    const unsigned int max_ref_frames = 12288 * 1024 / (mbw * mbh * 384);
-+    const unsigned int num_ref_frames = pic_descriptor->avc_num_ref_frames;
-+    if (max_ref_frames < num_ref_frames)
-+        pic_descriptor->level = 51;
-+  }
-+
-+  pic_descriptor->avc_num_slice_groups_minus1                 = h->pps.slice_group_count - 1;
-+  pic_descriptor->avc_num_ref_idx_l0_active_minus1            = h->pps.ref_count0 - 1;
-+  pic_descriptor->avc_num_ref_idx_l1_active_minus1            = h->pps.ref_count1 - 1;
-+
-+  pic_descriptor->avc_pic_init_qp_minus26                     = h->pps.init_qp - 26;
-+  pic_descriptor->avc_pic_init_qs_minus26                     = h->pps.init_qs - 26;
-+  pic_descriptor->avc_chroma_qp_index_offset                  = h->pps.chroma_qp_index_offset0;
-+  pic_descriptor->avc_second_chroma_qp_index_offset           = h->pps.chroma_qp_index_offset1;
-+  pic_descriptor->avc_slice_group_change_rate_minus1          = 0; // not implemented in ffmpeg
-+  pic_descriptor->avc_reserved_16bit                          = 0; // must be 0
-+  memset(pic_descriptor->avc_field_order_cnt_list,0,sizeof(pic_descriptor->avc_field_order_cnt_list)); // must be 0
-+  memset(pic_descriptor->avc_slice_group_map,0,sizeof(pic_descriptor->avc_slice_group_map)); // must be 0
-+
-+  // sps
-+  pic_descriptor->sps_info.avc.delta_pic_always_zero_flag     = h->sps.delta_pic_order_always_zero_flag;
-+  pic_descriptor->sps_info.avc.direct_8x8_inference_flag      = h->sps.direct_8x8_inference_flag;
-+  pic_descriptor->sps_info.avc.frame_mbs_only_flag            = h->sps.frame_mbs_only_flag;
-+  pic_descriptor->sps_info.avc.gaps_in_frame_num_value_allowed_flag = h->sps.gaps_in_frame_num_allowed_flag;
-+  pic_descriptor->sps_info.avc.mb_adaptive_frame_field_flag   = h->sps.mb_aff;
-+  pic_descriptor->sps_info.avc.residual_colour_transform_flag = h->sps.residual_color_transform_flag;
-+  pic_descriptor->sps_info.avc.xvba_avc_sps_reserved          = 0;
-+
-+  // pps
-+  pic_descriptor->pps_info.avc.entropy_coding_mode_flag       = h->pps.cabac;
-+  pic_descriptor->pps_info.avc.pic_order_present_flag         = h->pps.pic_order_present;
-+  pic_descriptor->pps_info.avc.weighted_pred_flag             = h->pps.weighted_pred;
-+  pic_descriptor->pps_info.avc.weighted_bipred_idc            = h->pps.weighted_bipred_idc;
-+  pic_descriptor->pps_info.avc.deblocking_filter_control_present_flag = h->pps.deblocking_filter_parameters_present;
-+  pic_descriptor->pps_info.avc.constrained_intra_pred_flag    = h->pps.constrained_intra_pred;
-+  pic_descriptor->pps_info.avc.redundant_pic_cnt_present_flag = h->pps.redundant_pic_cnt_present;
-+  pic_descriptor->pps_info.avc.transform_8x8_mode_flag        = h->pps.transform_8x8_mode;
-+  pic_descriptor->pps_info.avc.xvba_avc_pps_reserved          = 0; // must be 0
-+
-+  memcpy(iq_matrix->bScalingLists4x4, h->pps.scaling_matrix4, sizeof(iq_matrix->bScalingLists4x4));
-+  memcpy(iq_matrix->bScalingLists8x80, h->pps.scaling_matrix80, sizeof(iq_matrix->bScalingLists8x80));
-+  memcpy(iq_matrix->bScalingLists8x81, h->pps.scaling_matrix83, sizeof(iq_matrix->bScalingLists8x80));
-+
-+  // Wait for an I-frame before start decoding. Workaround for ATI UVD and UVD+ GPUs
-+  if (!h->got_first_iframe) {
-+      if (h->slice_type != AV_PICTURE_TYPE_I && h->slice_type != AV_PICTURE_TYPE_SI)
-+          return -1;
-+      h->got_first_iframe = 1;
-+  }
-+
-+  ff_h264_draw_horiz_band(h, 0, h->avctx->height);
-+
-+  return 0;
-+}
-+
-+/** Decode the given H.264 slice with XVBA. */
-+static int decode_slice(AVCodecContext *avctx,
-+                        const uint8_t  *buffer,
-+                        uint32_t        size)
-+{
-+  H264Context * const h = avctx->priv_data;
-+  struct xvba_render_state *render;
-+
-+  render = (struct xvba_render_state *)h->cur_pic_ptr->f.data0;
-+  assert(render);
-+
-+  ff_xvba_add_slice_data(render, buffer, size);
-+
-+  return 0;
-+}
-+
-+AVHWAccel ff_h264_xvba_hwaccel = {
-+    .name           = "h264_xvba",
-+    .type           = AVMEDIA_TYPE_VIDEO,
-+    .id             = CODEC_ID_H264,
-+    .pix_fmt        = AV_PIX_FMT_XVBA_VLD,
-+    .start_frame    = start_frame,
-+    .end_frame      = end_frame,
-+    .decode_slice   = decode_slice,
-+};
-diff --git a/libavcodec/xvba_internal.h b/libavcodec/xvba_internal.h
-new file mode 100644
-index 0000000..18faa3e
---- /dev/null
-+++ b/libavcodec/xvba_internal.h
-@@ -0,0 +1,25 @@
-+/*
-+ * HW decode acceleration for MPEG-2, H.264 and VC-1
-+ *
-+ * Copyright (C) 2005-2011 Team XBMC
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+int ff_xvba_translate_profile(int profile);
-+int ff_xvba_translate_picture_structure(int picture_structure);
-+void ff_xvba_add_slice_data(struct xvba_render_state *render, const uint8_t *buffer, uint32_t size);
-diff --git a/libavcodec/xvba_mpeg2.c b/libavcodec/xvba_mpeg2.c
-new file mode 100644
-index 0000000..0fc7d78
---- /dev/null
-+++ b/libavcodec/xvba_mpeg2.c
-@@ -0,0 +1,52 @@
-+/*
-+ * MPEG-2 HW decode acceleration through XVBA
-+ *
-+ * Copyright (C) 2005-2011 Team XBMC
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#include "dsputil.h"
-+
-+static int start_frame(AVCodecContext *avctx, av_unused const uint8_t *buffer, av_unused uint32_t size)
-+{
-+    struct MpegEncContext * const s = avctx->priv_data;
-+    return 0;
-+}
-+
-+static int end_frame(AVCodecContext *avctx)
-+{
-+    return 0;
-+}
-+
-+static int decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size)
-+{
-+    struct MpegEncContext * const s = avctx->priv_data;
-+    return 0;
-+}
-+
-+AVHWAccel ff_mpeg2_xvba_hwaccel = {
-+    .name           = "mpeg2_xvba",
-+    .type           = AVMEDIA_TYPE_VIDEO,
-+    .id             = CODEC_ID_MPEG2VIDEO,
-+    .pix_fmt        = AV_PIX_FMT_XVBA_VLD,
-+    .capabilities   = 0,
-+    .start_frame    = start_frame,
-+    .end_frame      = end_frame,
-+    .decode_slice   = decode_slice,
-+    .priv_data_size = 0,
-+};
-diff --git a/libavcodec/xvba_vc1.c b/libavcodec/xvba_vc1.c
-new file mode 100644
-index 0000000..e7a85a7
---- /dev/null
-+++ b/libavcodec/xvba_vc1.c
-@@ -0,0 +1,193 @@
-+/*
-+ * VC-1 HW decode acceleration through XVBA
-+ *
-+ * Copyright (C) 2005-2011 Team XBMC
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#include "xvba.h"
-+#include "xvba_internal.h"
-+#include "vc1.h"
-+#include "vc1data.h"
-+#include <assert.h>
-+
-+
-+/** @file
-+ * Implement structures of ffmpeg <-> XvBA
-+ */
-+
-+/* Initialize and start decoding a frame with XvBA */
-+static int start_frame(AVCodecContext *avctx,
-+				av_unused const uint8_t *buffer, 
-+				av_unused uint32_t size)
-+{
-+    VC1Context * const v = avctx->priv_data;
-+    MpegEncContext * const s = &v->s;
-+    struct xvba_render_state *render;
-+
-+    render = (struct xvba_render_state *)s->current_picture_ptr->f.data0;
-+    assert(render);
-+    
-+    render->num_slices = 0;
-+    return 0;
-+}
-+
-+/* End a hardware decoding based frame */
-+static int end_frame(AVCodecContext *avctx)
-+{
-+    VC1Context* const v = avctx->priv_data;
-+    MpegEncContext* const s = &v->s;
-+    struct xvba_render_state *render, *last, *next;
-+    XVBAPictureDescriptor *pic_descriptor;
-+
-+    render = (struct xvba_render_state *)s->current_picture_ptr->f.data0;
-+    assert(render);
-+
-+    if (render->picture_descriptor == 0)
-+      return -1;
-+
-+    pic_descriptor = render->picture_descriptor;
-+    
-+    av_dlog(avctx, "xvba_vc1_end_frame()\n");
-+    
-+    memset(pic_descriptor, 0, sizeof(*pic_descriptor));
-+
-+    /* Fill in Parameters - for reference see AMD sdk documentation */
-+    pic_descriptor->profile                                 = ff_xvba_translate_profile(v->profile);
-+    pic_descriptor->level                                   = v->level;
-+    //done like in va-driver and vaapi
-+    if (v->profile == PROFILE_ADVANCED) {
-+      pic_descriptor->width_in_mb                           = s->avctx->coded_width;
-+      pic_descriptor->height_in_mb                          = s->avctx->coded_height;
-+    } else {
-+      pic_descriptor->width_in_mb                           = s->mb_width;
-+      pic_descriptor->height_in_mb                          = s->mb_height;
-+    }
-+
-+    pic_descriptor->picture_structure                       = ff_xvba_translate_picture_structure(s->picture_structure);
-+
-+    // xvba-video set this to 1 only 4:2:0 supported
-+    // doc says: if not set, choose 1 - we try this
-+    pic_descriptor->chroma_format                           = 1;
-+    pic_descriptor->avc_intra_flag                          = s->pict_type == AV_PICTURE_TYPE_I || v->bi_type == 1;
-+    pic_descriptor->avc_reference                           = (s->current_picture_ptr->f.reference & 3) ? 1 : 0;
-+    
-+    // VC-1 explicit parameters see page 30 of sdk
-+    // sps_info
-+    pic_descriptor->sps_info.vc1.postprocflag               = v->postprocflag;
-+    
-+    // done as in vaapi
-+    pic_descriptor->sps_info.vc1.pulldown                   = v->broadcast;
-+    pic_descriptor->sps_info.vc1.interlace                  = v->interlace;
-+    pic_descriptor->sps_info.vc1.tfcntrflag                 = v->tfcntrflag;
-+    pic_descriptor->sps_info.vc1.finterpflag                = v->finterpflag;
-+    pic_descriptor->sps_info.vc1.reserved                   = 1;
-+    // eventually check if this makes sense together with interlace
-+    pic_descriptor->sps_info.vc1.psf                        = v->psf;
-+    // what about if it is a frame (page 31)
-+    // looked at xvba-driver
-+    pic_descriptor->sps_info.vc1.second_field               = v->interlace && v->second_field && (v->fcm == ILACE_FIELD);
-+    pic_descriptor->sps_info.vc1.xvba_vc1_sps_reserved      = 0;
-+    
-+    // VC-1 explicit parameters see page 30 of sdk
-+    // pps_info
-+    pic_descriptor->pps_info.vc1.panscan_flag               = v->panscanflag;
-+    pic_descriptor->pps_info.vc1.refdist_flag               = v->refdist_flag;
-+    pic_descriptor->pps_info.vc1.loopfilter                 = s->loop_filter;
-+    pic_descriptor->pps_info.vc1.fastuvmc                   = v->fastuvmc;
-+    pic_descriptor->pps_info.vc1.extended_mv                = v->extended_mv;
-+    pic_descriptor->pps_info.vc1.dquant                     = v->dquant;
-+    pic_descriptor->pps_info.vc1.vstransform                = v->vstransform;
-+    pic_descriptor->pps_info.vc1.overlap                    = v->overlap;
-+    pic_descriptor->pps_info.vc1.quantizer                  = v->quantizer_mode;
-+    pic_descriptor->pps_info.vc1.extended_dmv               = v->extended_dmv;   
-+    pic_descriptor->pps_info.vc1.maxbframes                 = s->avctx->max_b_frames;
-+    pic_descriptor->pps_info.vc1.rangered                   = (pic_descriptor->profile == PROFILE_SIMPLE) ? 0 : v->rangered;   
-+    pic_descriptor->pps_info.vc1.syncmarker                 = (pic_descriptor->profile == PROFILE_SIMPLE) ? 0 : s->resync_marker;
-+    pic_descriptor->pps_info.vc1.multires                   = v->multires;
-+    pic_descriptor->pps_info.vc1.reserved                   = 1;
-+    pic_descriptor->pps_info.vc1.range_mapy_flag            = v->range_mapy_flag;
-+    pic_descriptor->pps_info.vc1.range_mapy                 = v->range_mapy;
-+    pic_descriptor->pps_info.vc1.range_mapuv_flag           = v->range_mapuv_flag;
-+    pic_descriptor->pps_info.vc1.range_mapuv                = v->range_mapuv;
-+    pic_descriptor->pps_info.vc1.xvba_vc1_pps_reserved      = 0;
-+    
-+    pic_descriptor->past_surface                            = 0;
-+    pic_descriptor->future_surface                          = 0;
-+    switch (s->pict_type) {
-+    case AV_PICTURE_TYPE_B:
-+        next = (struct xvba_render_state *)s->next_picture.f.data0;
-+        assert(next);
-+        if (next)
-+          pic_descriptor->past_surface = next->surface;
-+        // fall-through
-+    case AV_PICTURE_TYPE_P:
-+        last = (struct xvba_render_state *)s->last_picture.f.data0;
-+        assert(last);
-+        if (last)
-+          pic_descriptor->future_surface = last->surface;
-+        break;
-+    }
-+    render->psf = v->psf;
-+
-+    ff_mpeg_draw_horiz_band(s, 0, s->avctx->height);
-+
-+    return 0;
-+}
-+
-+static int decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size)
-+{
-+  VC1Context* const v = avctx->priv_data;
-+  MpegEncContext* const s = &v->s;
-+  struct xvba_render_state *render;
-+
-+  render = (struct xvba_render_state *)s->current_picture_ptr->f.data0;
-+  assert(render);
-+
-+  if (avctx->codec_id == CODEC_ID_VC1 &&
-+      size >= 4 && IS_MARKER(AV_RB32(buffer))) {
-+      buffer += 4;
-+      size   -= 4;
-+  }
-+
-+  ff_xvba_add_slice_data(render, buffer, size);
-+
-+  return 0;
-+}
-+
-+#if CONFIG_WMV3_XVBA_HWACCEL
-+AVHWAccel ff_wmv3_xvba_hwaccel = {
-+    .name           = "wmv3_xvba",
-+    .type           = AVMEDIA_TYPE_VIDEO,
-+    .id             = CODEC_ID_WMV3,
-+    .pix_fmt        = AV_PIX_FMT_XVBA_VLD,
-+    .start_frame    = start_frame,
-+    .end_frame      = end_frame,
-+    .decode_slice   = decode_slice,
-+};
-+#endif
-+
-+AVHWAccel ff_vc1_xvba_hwaccel = {
-+    .name           = "vc1_xvba",
-+    .type           = AVMEDIA_TYPE_VIDEO,
-+    .id             = CODEC_ID_VC1,
-+    .pix_fmt        = AV_PIX_FMT_XVBA_VLD,
-+    .start_frame    = start_frame,
-+    .end_frame      = end_frame,
-+    .decode_slice   = decode_slice,
-+};
-diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
-index 1016dba..53dfec1 100644
---- a/libavutil/pixdesc.c
-+++ b/libavutil/pixdesc.c
-@@ -1141,6 +1141,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptorsAV_PIX_FMT_NB = {
-         .log2_chroma_h = 1,
-         .flags = PIX_FMT_HWACCEL,
-     },
-+    AV_PIX_FMT_XVBA_VLD = {
-+        .name = "xvba_vld",
-+        .log2_chroma_w = 1,
-+        .log2_chroma_h = 1,
-+        .flags = PIX_FMT_HWACCEL,
-+    },
-     AV_PIX_FMT_YUV420P9LE = {
-         .name = "yuv420p9le",
-         .nb_components = 3,
-diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
-index 1c00ac4..6437e29 100644
---- a/libavutil/pixfmt.h
-+++ b/libavutil/pixfmt.h
-@@ -124,6 +124,7 @@ enum AVPixelFormat {
-     AV_PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data3 contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
-     AV_PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data3 contains a vaapi_render_state struct which contains fields extracted from headers
-     AV_PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data3 contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-+    AV_PIX_FMT_XVBA_VLD,  ///< HW decoding through xvba, Picture.data3 contains a xvba_rander_state struct which contains the bitstream of the slices
- 
-     AV_PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-     AV_PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian

avidemux_2.6.12.tar.gz -> avidemux_2.6.13.tar.gz Changed

ffmpeg-2.8.6.tar.bz2 Deleted

Build Results
RPM Lint

Refresh

Comments for request 2853 0

Request History

enzokiel created request almost 10 years ago

Update to version 2.6.13

enzokiel accepted request almost 10 years ago

Please add a comment