virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

vc1: explicitly zero interlaced mode coding variables for progressive mode

Browse Source 
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@gmail.com>
This commit is contained in:
Kostya Shishkov 2011-10-13 10:12:42 +02:00 committed by Ronald S. Bultje
parent 47a1d794db
commit 42feaf4070
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/vc1.c
View File

@ -832,17 +832,18 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
goto parse_common_info; goto parse_common_info;
} }
v->field_mode = 0;
if (v->interlace) { if (v->interlace) {
v->fcm = decode012(gb); v->fcm = decode012(gb);
if (v->fcm) { if (v->fcm) {
if (v->fcm == 2) if (v->fcm == 2)
v->field_mode = 1; v->field_mode = 1;
else
v->field_mode = 0;
if (!v->warn_interlaced++) if (!v->warn_interlaced++)
av_log(v->s.avctx, AV_LOG_ERROR, av_log(v->s.avctx, AV_LOG_ERROR,
"Interlaced frames/fields support is incomplete\n"); "Interlaced frames/fields support is incomplete\n");
} }
} else {
v->fcm = 0;
} }
if (v->field_mode) { if (v->field_mode) {