Description: fix denial of service and possible code execution via malformed AMV file
Origin: upstream, http://git.videolan.org/?p=ffmpeg.git;a=commit;h=89f903b3d5ec38c9c5d90fba7e626fa0eda61a32
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624339

diff -Nur ffmpeg-0.6/libavcodec/sp5xdec.c ffmpeg-0.6.new/libavcodec/sp5xdec.c
--- ffmpeg-0.6/libavcodec/sp5xdec.c	2010-04-20 10:45:34.000000000 -0400
+++ ffmpeg-0.6.new/libavcodec/sp5xdec.c	2011-09-16 09:32:08.866352075 -0400
@@ -90,7 +90,6 @@
     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;
@@ -216,6 +215,6 @@
     NULL,
     ff_mjpeg_decode_end,
     sp5x_decode_frame,
-    CODEC_CAP_DR1,
+    0,
     .long_name = NULL_IF_CONFIG_SMALL("AMV Video"),
 };