summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorEtienne Buira <etienne.buira.lists@free.fr>2011-05-26 19:48:59 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-05-27 04:36:13 +0200
commit5918d16742277f417f28ae59417b871a2ed8b39c (patch)
tree4ac0ff5c95a76b7abc682bee9d499d6095b292d2 /libavcodec
parent2660e9e1f398dbc8d447164a772b52281fa94a30 (diff)
Minor cleanup in libx264.c
Not needed as overwritten later on (look for "// update AVCodecContext with x264 parameters"), and not accessed inbetween. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/libx264.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 28683a930a..7a58f2b6e0 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -228,7 +228,6 @@ static av_cold int X264_init(AVCodecContext *avctx)
x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
x4->params.i_bframe_bias = avctx->bframebias;
x4->params.i_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID ? X264_B_PYRAMID_NORMAL : X264_B_PYRAMID_NONE;
- 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)