|
|
@ -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; |