Browse Source

Clifford Wolf:


			
			
				rocklinux
			
			
		
Clifford Wolf 15 years ago
parent
commit
f3fcb8a9a2
4 changed files with 45 additions and 0 deletions
  1. +11
    -0
      package/base/ffmpeg/libx264_buildfix.patch
  2. +11
    -0
      package/base/ffmpeg/libx264_config.patch
  3. +22
    -0
      package/base/mplayer/libx264-hotfix2.patch
  4. +1
    -0
      package/base/x264/x264.conf

+ 11
- 0
package/base/ffmpeg/libx264_buildfix.patch

@ -0,0 +1,11 @@
--- ./libavcodec/libx264.c.orig 2010-01-04 10:56:53.000000000 +0000
+++ ./libavcodec/libx264.c 2010-01-04 10:57:23.000000000 +0000
@@ -166,7 +166,7 @@
x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
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;
+ x4->params.i_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID;
avctx->has_b_frames= avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames;
x4->params.i_keyint_min = avctx->keyint_min;

+ 11
- 0
package/base/ffmpeg/libx264_config.patch

@ -0,0 +1,11 @@
--- ./configure.orig 2010-01-04 10:14:17.000000000 +0000
+++ ./configure 2010-01-04 10:14:23.000000000 +0000
@@ -1993,7 +1993,7 @@
enabled libspeex && require libspeex speex/speex.h speex_decoder_init -lspeex
enabled libtheora && require libtheora theora/theora.h theora_info_init -ltheora -logg
enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg
-enabled libx264 && require libx264 x264.h x264_encoder_open -lx264 -lm &&
+enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 -lm &&
{ check_cpp_condition x264.h "X264_BUILD >= 65" ||
die "ERROR: libx264 version must be >= 0.65."; }
enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore

+ 22
- 0
package/base/mplayer/libx264-hotfix2.patch

@ -0,0 +1,22 @@
--- ./libavcodec/libx264.c.orig 2010-01-04 12:12:35.000000000 +0100
+++ ./libavcodec/libx264.c 2010-01-04 12:12:49.000000000 +0100
@@ -166,7 +166,7 @@
x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
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);
+ x4->params.i_bframe_pyramid = (avctx->flags2 & CODEC_FLAG2_BPYRAMID);
avctx->has_b_frames= (avctx->flags2 & CODEC_FLAG2_BPYRAMID) ? 2 : !!avctx->max_b_frames;
x4->params.i_keyint_min = avctx->keyint_min;
--- ./libmpcodecs/ve_x264.c.orig 2010-01-04 12:12:35.000000000 +0100
+++ ./libmpcodecs/ve_x264.c 2010-01-04 12:12:41.000000000 +0100
@@ -232,7 +232,7 @@
mod->mux->bih->biSize= sizeof(BITMAPINFOHEADER) + extradata_size;
}
- if (param.i_bframe > 1 && param.b_bframe_pyramid)
+ if (param.i_bframe > 1 && param.i_bframe_pyramid)
mod->mux->decoder_delay = 2;
else
mod->mux->decoder_delay = param.i_bframe ? 1 : 0;

+ 1
- 0
package/base/x264/x264.conf

@ -21,5 +21,6 @@
# --- ROCK-COPYRIGHT-NOTE-END --- # --- ROCK-COPYRIGHT-NOTE-END ---
var_append confopt " " "--enable-shared"
var_append confopt " " "--enable-pthread" var_append confopt " " "--enable-pthread"
pkginstalled gpac && var_append confopt " " "--enable-mp4-output" pkginstalled gpac && var_append confopt " " "--enable-mp4-output"

Loading…
Cancel
Save