diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-08-30 21:18:17 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-08-30 21:18:17 +0000 |
| commit | 504ee036ee7f8bb2fc7e8d8278362f6250899d46 (patch) | |
| tree | dc4d442c025c60fd353390d6e5b082e49f41acf9 /libavcodec/x264.c | |
| parent | 56d2d2d01a96ed801517f826285f4c9877f46db3 (diff) | |
| download | ffmpeg-504ee036ee7f8bb2fc7e8d8278362f6250899d46.tar.gz | |
fix b pyramid in mp4 muxing if no dts are provided to the muxer
Originally committed as revision 6133 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/x264.c')
| -rw-r--r-- | libavcodec/x264.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/x264.c b/libavcodec/x264.c index 9be6a3eb97..16ebb8ebab 100644 --- a/libavcodec/x264.c +++ b/libavcodec/x264.c @@ -160,6 +160,7 @@ X264_init(AVCodecContext *avctx) x4->params.b_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; x4->params.i_keyint_min = avctx->keyint_min; if(x4->params.i_keyint_min > x4->params.i_keyint_max) |