avcodec/mpegvideo: dont overwrite emu_edge buffer

[ffmpeg] / libavcodec / huffyuvdec.c

diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c
index 3120c799f8ed7938eadc810818caa6243f855710..74872d2caa74fbd49ea7d8b664b20de95308593f 100644 (file)
--- a/libavcodec/huffyuvdec.c
+++ b/libavcodec/huffyuvdec.c
@@ -770,7 +770,8 @@ static av_always_inline void decode_bgr_1(HYuvContext *s, int count,
                 index = SHOW_UBITS(re, &s->gb, VLC_BITS);
                 VLC_INTERN(s->temp[0][4 * i + A], s->vlc[2].table,
                            &s->gb, re, VLC_BITS, 3);
-            }
+            } else
+                s->temp[0][4 * i + A] = 0;
         }
     }
     CLOSE_READER(re, &s->gb);
@@ -866,8 +867,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
     if (!s->bitstream_buffer)
         return AVERROR(ENOMEM);
 
-    s->dsp.bswap_buf((uint32_t*)s->bitstream_buffer,
-                     (const uint32_t*)buf, buf_size / 4);
+    s->bdsp.bswap_buf((uint32_t *) s->bitstream_buffer,
+                      (const uint32_t *) buf, buf_size / 4);
 
     if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0)
         return ret;