Sophie: avidemux-2.6.8-9.mga5 src

avidemux-2.6.8-9.mga5.src.rpm

--- avidemux_2.6.8/cmake/admFFmpegBuild.cmake.old	2014-07-03 11:56:51.942203575 -0400
+++ avidemux_2.6.8/cmake/admFFmpegBuild.cmake	2014-07-03 11:57:06.612259075 -0400
@@ -9,7 +9,7 @@
 
 option(FF_INHERIT_BUILD_ENV "" ON)
 
-set(FFMPEG_VERSION "1.2.1")
+set(FFMPEG_VERSION "1.2.12")
 set(FFMPEG_ROOT_DIR "${AVIDEMUX_TOP_SOURCE_DIR}/avidemux_core/ffmpeg_package")
 set(FFMPEG_PATCH_DIR  "${FFMPEG_ROOT_DIR}/patches/")
 set(FFMPEG_SOURCE_ARCHIVE "ffmpeg-${FFMPEG_VERSION}.tar.bz2")
--- avidemux_2.6.8/avidemux_core/ffmpeg_package/patches/xvba/xvba_support_from_xbmc_xvba.patch.old	2014-07-03 12:14:17.366141626 -0400
+++ avidemux_2.6.8/avidemux_core/ffmpeg_package/patches/xvba/xvba_support_from_xbmc_xvba.patch	2014-07-03 12:17:29.456766713 -0400
@@ -3,9 +3,9 @@
 --- a/configure
 +++ b/configure
 @@ -144,6 +144,7 @@ Hardware accelerators:
-   --enable-vaapi           enable VAAPI code
+   --disable-vaapi          disable VAAPI code [autodetect]
    --enable-vda             enable VDA code
-   --enable-vdpau           enable VDPAU code
+   --disable-vdpau          disable VDPAU code [autodetect]
 +  --disable-xvba           disable XVBA code
  
  Individual component options: