aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/sp5xdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-21 22:04:21 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-21 22:44:55 +0200
commit89f903b3d5ec38c9c5d90fba7e626fa0eda61a32 (patch)
treeab4c7076b748f2a4004aa70c173a6abfee6a91ef /libavcodec/sp5xdec.c
parent73a51e00a74df079507d6355a4e353494ddb0385 (diff)
downloadffmpeg-89f903b3d5ec38c9c5d90fba7e626fa0eda61a32.tar.gz
AMV: Fix possibly exploitable crash.
Reported-at: Thu, 21 Apr 2011 14:38:25 +0000 Reported-by: Dominic Chell <Dominic.Chell@ngssecure.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sp5xdec.c')
-rw-r--r--libavcodec/sp5xdec.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c
index 8bcdbe41b4..dd31edaf85 100644
--- a/libavcodec/sp5xdec.c
+++ b/libavcodec/sp5xdec.c
@@ -86,7 +86,6 @@ static int sp5x_decode_frame(AVCodecContext *avctx,
recoded[j++] = 0xFF;
recoded[j++] = 0xD9;
- avctx->flags &= ~CODEC_FLAG_EMU_EDGE;
av_init_packet(&avpkt_recoded);
avpkt_recoded.data = recoded;
avpkt_recoded.size = j;
@@ -121,6 +120,6 @@ AVCodec ff_amv_decoder = {
NULL,
ff_mjpeg_decode_end,
sp5x_decode_frame,
- CODEC_CAP_DR1,
+ 0,
.long_name = NULL_IF_CONFIG_SMALL("AMV Video"),
};