commit e9210b4e174c75a7c1c9248a700eae8ac9a5a1b9
author Michael Niedermayer <michaelni@gmx.at> Thu Nov 03 02:22:07 2011 +0100
committer Michael Niedermayer <michaelni@gmx.at> Thu Nov 03 02:23:42 2011 +0100
tree 339be58a225dfaf77fcae3f096e92f84e3b8ecd4
parent 24cd7c5df78c53c1d1a36b81fb130594e84b3f12
parent 4f07a3aa2c6b7356c28646692261aa9080605fcc

Merge remote-tracking branch 'qatar/release/0.5' into release/0.5

* qatar/release/0.5:
  Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080.
  cavs: fix some crashes with invalid bitstreams
  mjpeg: Detect overreads in mjpeg_decode_scan() and error out.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/sp5xdec.c

diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c
index 920b32d..f1e436c 100644
--- a/libavcodec/sp5xdec.c
+++ b/libavcodec/sp5xdec.c
@@ -88,7 +88,6 @@
     recoded[j++] = 0xFF;
     recoded[j++] = 0xD9;
 
-    avctx->flags &= ~CODEC_FLAG_EMU_EDGE;
     i = ff_mjpeg_decode_frame(avctx, data, data_size, recoded, j);
 
     av_free(recoded);

libavutil/log.c

diff --git a/libavutil/log.c b/libavutil/log.c
index 4bb9652..fb773d0 100644
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -33,7 +33,8 @@
 {
     static int print_prefix=1;
     static int count;
-    static char line[1024], prev[1024];
+    static char prev[1024];
+    char line[1024];
     AVClass* avc= ptr ? *(AVClass**)ptr : NULL;
     if(level>av_log_level)
         return;