diff options
author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2007-02-06 07:11:20 +0000 |
---|---|---|
committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2007-02-06 07:11:20 +0000 |
commit | 6eda6e37a951e4a3e4eed702cc5eb2ecb489018a (patch) | |
tree | 9e805b2d32641d6aae55f4b289665f33d431b170 /libavcodec/vc1.c | |
parent | 02c823d4f3cf4d40a9dabd4d5f815ea73e242f6f (diff) | |
download | ffmpeg-streaming-6eda6e37a951e4a3e4eed702cc5eb2ecb489018a.zip ffmpeg-streaming-6eda6e37a951e4a3e4eed702cc5eb2ecb489018a.tar.gz |
B-frames could not be determined from broken_link/closed_entry, use fixed value
Originally committed as revision 7848 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/vc1.c')
-rw-r--r-- | libavcodec/vc1.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index df3e706..d344d03 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -1304,6 +1304,7 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb) av_log(v->s.avctx, AV_LOG_ERROR, "Progressive Segmented Frame mode: not supported (yet)\n"); return -1; } + v->s.max_b_frames = v->s.avctx->max_b_frames = 7; if(get_bits1(gb)) { //Display Info - decoding is not affected by it int w, h, ar = 0; av_log(v->s.avctx, AV_LOG_DEBUG, "Display extended info:\n"); @@ -1359,11 +1360,11 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb) static int decode_entry_point(AVCodecContext *avctx, GetBitContext *gb) { VC1Context *v = avctx->priv_data; - int i, blink, refdist; + int i, blink, clentry, refdist; av_log(avctx, AV_LOG_DEBUG, "Entry point: %08X\n", show_bits_long(gb, 32)); blink = get_bits1(gb); // broken link - avctx->max_b_frames = 1 - get_bits1(gb); // 'closed entry' also signalize possible B-frames + clentry = get_bits1(gb); // closed entry v->panscanflag = get_bits1(gb); refdist = get_bits1(gb); // refdist flag v->s.loop_filter = get_bits1(gb); @@ -1399,7 +1400,7 @@ static int decode_entry_point(AVCodecContext *avctx, GetBitContext *gb) "BrokenLink=%i, ClosedEntry=%i, PanscanFlag=%i\n" "RefDist=%i, Postproc=%i, FastUVMC=%i, ExtMV=%i\n" "DQuant=%i, VSTransform=%i, Overlap=%i, Qmode=%i\n", - blink, 1 - avctx->max_b_frames, v->panscanflag, refdist, v->s.loop_filter, + blink, clentry, v->panscanflag, refdist, v->s.loop_filter, v->fastuvmc, v->extended_mv, v->dquant, v->vstransform, v->overlap, v->quantizer_mode); return 0; |