diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 09:57:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 09:57:28 +0200 |
| commit | cb22692f05f916ba521a88e198fa8d15f92c9303 (patch) | |
| tree | 979d4ab2a6d360e99c3f0dcfb65c20bd2f7da048 /libavcodec/vc1.c | |
| parent | b602e47f12d72b383d986d66212341af31c9bc82 (diff) | |
| parent | fe06795d783785a76c6cbcaa2cd3012e6deb5fa5 (diff) | |
Merge commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5'
* commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5':
vc1: implement frame interlaced b-frame header parsing
Conflicts:
libavcodec/vc1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1.c')
| -rw-r--r-- | libavcodec/vc1.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index 4c17033ef5..f039d722e7 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -1249,7 +1249,8 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) } else if (v->fcm == ILACE_FRAME) { if (v->extended_dmv) v->dmvrange = get_unary(gb, 0, 3); - get_bits1(gb); /* intcomp - present but shall always be 0 */ + if (get_bits1(gb)) /* intcomp - present but shall always be 0 */ + av_log(v->s.avctx, AV_LOG_WARNING, "Intensity compensation set for B picture\n"); v->intcomp = 0; v->mv_mode = MV_PMODE_1MV; v->fourmvswitch = 0; |