[FFmpeg-cvslog] vc1: Reset numref if fieldmode is not set

Kostya Shishkov git at videolan.org
Sun Jan 12 15:52:49 CET 2014


ffmpeg | branch: release/1.1 | Kostya Shishkov <kostya.shishkov at gmail.com> | Mon Nov 25 14:04:41 2013 +0100| [5dcc17992430f4ef910b06956b4d19af98880670] | committer: Reinhard Tartler

vc1: Reset numref if fieldmode is not set

There are samples in the wild with B-frames and P-frames with different
interlace mode.

CC: libav-stable at libav.org
Reported-by: Jean-Baptiste Kempf <jb at videolan.org>
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
(cherry picked from commit de44dfc7c0ec02bda7d846ef713145c890bfae3f)

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5dcc17992430f4ef910b06956b4d19af98880670
---

 libavcodec/vc1.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index a8dd38a..21449bd 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -992,6 +992,8 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
                 v->reffield          = get_bits1(gb);
                 v->ref_field_type[0] = v->reffield ^ !v->cur_field_type;
             }
+        } else {
+            v->numref = 0;
         }
         if (v->extended_mv)
             v->mvrange = get_unary(gb, 0, 3);



More information about the ffmpeg-cvslog mailing list