aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-11 03:42:51 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-11 03:42:51 +0200
commit1e4d60353cdb50619bc39d78f84afe961d013fae (patch)
tree4e5dea9850aa739031841bcb638c6c4b63210e28
parent41f55277fafeec4f1b3202967bd0ab120948dd69 (diff)
downloadffmpeg-1e4d60353cdb50619bc39d78f84afe961d013fae.tar.gz
vc1: disable parts of the interlaced code due to security issues.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/vc1.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index bc7489d0ab..9e3ad4d6f1 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -985,6 +985,8 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
break;
case AV_PICTURE_TYPE_P:
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);
if (!v->numref) {
v->reffield = get_bits1(gb);
@@ -1157,6 +1159,8 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
if (v->field_mode) {
int mvmode;
+ av_log(v->s.avctx, AV_LOG_ERROR, "B Fields do not work currently\n");
+ return -1;
if (v->extended_dmv)
v->dmvrange = get_unary(gb, 0, 3);
mvmode = get_unary(gb, 1, 3);