diff options
| author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-26 15:13:41 -0500 |
|---|---|---|
| committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-26 15:13:41 -0500 |
| commit | d26fb8dc20ba3b0e6ef535761b3ac5fd8e7b7c70 (patch) | |
| tree | ae84713aa59e8e2eaa4a2a19db89294ea0b4c1cf /extra/avidemux/avidemux-2.5.4-x264-build115.patch | |
| parent | 2095d71af1b9e0c1dff405c178a9481d1020ca3e (diff) | |
| parent | 8999fa1750304fb2367fb7743e49e013405e88be (diff) | |
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el
Conflicts:
community/distcc/PKGBUILD
community/lxtask/PKGBUILD
community/ushare/PKGBUILD
extra/catdoc/PKGBUILD
extra/curl/PKGBUILD
extra/ethstatus/PKGBUILD
extra/ffcall/PKGBUILD
extra/gimp-dbp/PKGBUILD
extra/gimp-refocus/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/metacity/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/x2x/PKGBUILD
libre/kernel26-libre/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/wine/PKGBUILD
testing/alex/PKGBUILD
testing/ghc/PKGBUILD
testing/haskell-cgi/PKGBUILD
testing/haskell-deepseq/PKGBUILD
testing/haskell-fgl/PKGBUILD
testing/haskell-glut/PKGBUILD
testing/haskell-haskell-src/PKGBUILD
testing/haskell-html/PKGBUILD
testing/haskell-http/PKGBUILD
testing/haskell-hunit/PKGBUILD
testing/haskell-mtl/PKGBUILD
testing/haskell-network/PKGBUILD
testing/haskell-opengl/PKGBUILD
testing/haskell-parallel/PKGBUILD
testing/haskell-parsec/PKGBUILD
testing/haskell-platform/PKGBUILD
testing/haskell-quickcheck/PKGBUILD
testing/haskell-regex-base/PKGBUILD
testing/haskell-regex-compat/PKGBUILD
testing/haskell-regex-posix/PKGBUILD
testing/haskell-stm/PKGBUILD
testing/haskell-syb/PKGBUILD
testing/haskell-text/PKGBUILD
testing/haskell-transformers/PKGBUILD
testing/haskell-xhtml/PKGBUILD
testing/haskell-zlib/PKGBUILD
testing/perl/ChangeLog
testing/perl/PKGBUILD
testing/perl/perlbin.sh
testing/pidgin/PKGBUILD
testing/spamassassin/PKGBUILD
Diffstat (limited to 'extra/avidemux/avidemux-2.5.4-x264-build115.patch')
| -rw-r--r-- | extra/avidemux/avidemux-2.5.4-x264-build115.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/extra/avidemux/avidemux-2.5.4-x264-build115.patch b/extra/avidemux/avidemux-2.5.4-x264-build115.patch new file mode 100644 index 000000000..c627667ec --- /dev/null +++ b/extra/avidemux/avidemux-2.5.4-x264-build115.patch @@ -0,0 +1,45 @@ +diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp +--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:35:36.000000000 +0200 ++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:40:26.000000000 +0200 +@@ -488,8 +488,10 @@ + printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
+ printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
+ printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
+-#if X264_BUILD > 101
++#if X264_BUILD > 101 && X264_BUILD < 115
+ printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
++#elif X264_BUILD > 114
++ printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
+ #endif
+ printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
+ #if X264_BUILD > 88
+diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp +--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:35:36.000000000 +0200 ++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:43:36.000000000 +0200 +@@ -417,7 +417,7 @@ + _param.b_cabac = cabac;
+ }
+
+-#if X264_BUILD > 101
++#if X264_BUILD > 101 && X264_BUILD < 115
+ unsigned int x264Options::getOpenGopMode(void)
+ {
+ return _param.i_open_gop;
+@@ -428,6 +428,17 @@ + if (openGopMode < 3)
+ _param.i_open_gop = openGopMode;
+ }
++#elif X264_BUILD > 114
++unsigned int x264Options::getOpenGopMode(void)
++{
++ return _param.b_open_gop;
++}
++
++void x264Options::setOpenGopMode(unsigned int openGopMode)
++{
++ if (openGopMode < 3)
++ _param.b_open_gop = openGopMode;
++}
+ #endif
+
+ unsigned int x264Options::getInterlaced(void)
|