Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	ffmpeg-compat.spec
@@ -43,6 +43,7 @@ Source0: ffmpeg-svn.tar.bz2 Patch0: ffmpeg_configure.diff +Patch1: ffmpeg-x264.patch BuildRoot: %{_tmppath}/%{name}-buildroot Prefix: %{_prefix} Requires: %{libnameavcodec} = %{version}-%{release} @@ -107,6 +108,7 @@ BuildRequires: libfaad2-devel >= 2.6 BuildRequires: libfaac-devel >= 1.26 BuildRequires: libx264-devel +BuildRequires: libx264-60 BuildRequires: xvid-devel BuildRequires: libmp4v2-devel BuildRequires: texinfo @@ -167,7 +169,7 @@ %prep %setup -q -n ffmpeg %patch0 - +%patch1 -p2 %suse_update_libdir configure #don't call ldconfig on install #perl -pi -e 's/ldconfig \\|\\| true//' libavcodec/Makefile x 1 @@ -43,6 +43,7 @@ 2 Source0: ffmpeg-svn.tar.bz2 3 4 Patch0: ffmpeg_configure.diff 5 +Patch1: ffmpeg-x264.patch 6 BuildRoot: %{_tmppath}/%{name}-buildroot 7 Prefix: %{_prefix} 8 Requires: %{libnameavcodec} = %{version}-%{release} 9 @@ -107,6 +108,7 @@ 10 BuildRequires: libfaad2-devel >= 2.6 11 BuildRequires: libfaac-devel >= 1.26 12 BuildRequires: libx264-devel 13 +BuildRequires: libx264-60 14 BuildRequires: xvid-devel 15 BuildRequires: libmp4v2-devel 16 BuildRequires: texinfo 17 @@ -167,7 +169,7 @@ 18 %prep 19 %setup -q -n ffmpeg 20 %patch0 21 - 22 +%patch1 -p2 23 %suse_update_libdir configure 24 #don't call ldconfig on install 25 #perl -pi -e 's/ldconfig \\|\\| true//' libavcodec/Makefile 26
[-] [+]	Added	ffmpeg-x264.patch ^
@@ -0,0 +1,11 @@ +--- ffmpeg-compat/ffmpeg/libavcodec/libx264.c 2008-08-29 21:38:06.000000000 +0200 ++++ ffmpeg/ffmpeg/libavcodec/libx264.c 2008-10-13 21:42:31.000000000 +0200 +@@ -162,7 +164,7 @@ + + x4->params.i_bframe = avctx->max_b_frames; + x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC; +- x4->params.b_bframe_adaptive = avctx->b_frame_strategy; ++ x4->params.i_bframe_adaptive = avctx->b_frame_strategy; + x4->params.i_bframe_bias = avctx->bframebias; + x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID; + avctx->has_b_frames= avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames;