RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vc1: disable parts of the interlaced code due to security issues. 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-10-11 03:42:51 +02:00
parent 41f55277fa
commit 1e4d60353c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/vc1.c
View File

@ -985,6 +985,8 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
break; break;
case AV_PICTURE_TYPE_P: case AV_PICTURE_TYPE_P:
if (v->field_mode) { if (v->field_mode) {
av_log(v->s.avctx, AV_LOG_ERROR, "P Fields do not work currently\n");
return -1;
v->numref = get_bits1(gb); v->numref = get_bits1(gb);
if (!v->numref) { if (!v->numref) {
v->reffield = get_bits1(gb); v->reffield = get_bits1(gb);
@ -1157,6 +1159,8 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
if (v->field_mode) { if (v->field_mode) {
int mvmode; int mvmode;
av_log(v->s.avctx, AV_LOG_ERROR, "B Fields do not work currently\n");
return -1;
if (v->extended_dmv) if (v->extended_dmv)
v->dmvrange = get_unary(gb, 0, 3); v->dmvrange = get_unary(gb, 0, 3);
mvmode = get_unary(gb, 1, 3); mvmode = get_unary(gb, 1, 3);