[FFmpeg-cvslog] vc1: explicitly zero interlaced mode coding variables for progressive mode
Kostya Shishkov
git at videolan.org
Fri Oct 14 03:58:28 CEST 2011
ffmpeg | branch: master | Kostya Shishkov <kostya.shishkov at gmail.com> | Thu Oct 13 10:12:42 2011 +0200| [42feaf40700246d9afb9c27ef09a0022ddfdb998] | committer: Ronald S. Bultje
vc1: explicitly zero interlaced mode coding variables for progressive mode
Both v->fcm and v->field_mode are used in common code, now they won't be
reset for progressive frame after interlaced one causing writing past the
frame end for example.
Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42feaf40700246d9afb9c27ef09a0022ddfdb998
---
libavcodec/vc1.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 9d36811..cb228e6 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -832,17 +832,18 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
goto parse_common_info;
}
+ v->field_mode = 0;
if (v->interlace) {
v->fcm = decode012(gb);
if (v->fcm) {
if (v->fcm == 2)
v->field_mode = 1;
- else
- v->field_mode = 0;
if (!v->warn_interlaced++)
av_log(v->s.avctx, AV_LOG_ERROR,
"Interlaced frames/fields support is incomplete\n");
}
+ } else {
+ v->fcm = 0;
}
if (v->field_mode) {
More information about the ffmpeg-cvslog
mailing list