[FFmpeg-cvslog] r26168 - trunk/libavcodec/vp8.c

[rbultje]

Author: rbultje
Date: Thu Dec 30 15:33:21 2010
New Revision: 26168

Log:
Fix valgrind invalid read on top MB rows with CODEC_FLAG_EMU_EDGE set.

Modified:
   trunk/libavcodec/vp8.c

Modified: trunk/libavcodec/vp8.c
==============================================================================
--- trunk/libavcodec/vp8.c	Thu Dec 30 15:21:14 2010	(r26167)
+++ trunk/libavcodec/vp8.c	Thu Dec 30 15:33:21 2010	(r26168)
@@ -1104,7 +1104,8 @@ void intra_predict(VP8Context *s, uint8_
 
         // if we're on the right edge of the frame, said edge is extended
         // from the top macroblock
-        if (mb_x == s->mb_width-1) {
+        if (!(!mb_y && avctx->flags & CODEC_FLAG_EMU_EDGE) &&
+            mb_x == s->mb_width-1) {
             tr = tr_right[-1]*0x01010101;
             tr_right = (uint8_t *)&tr;
         }