Merge commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da'

* commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da': mmvideo: fix uninitialized variable use in mm_decode_intra Conflicts: libavcodec/mmvideo.c See: c2e3b564b3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 8930637819
parent b96dddd344 fc06ee6ee3
commit 8930637819
1 changed files with 2 additions and 1 deletions
--- a/libavcodec/mmvideo.c
+++ b/libavcodec/mmvideo.c
@ -129,7 +129,8 @@ static int mm_decode_intra(MmContext * s, int half_horiz, int half_vert)
 */
 static int mm_decode_inter(MmContext * s, int half_horiz, int half_vert)
 {
-    int data_off = bytestream2_get_le16(&s->gb), y = 0;
+    int data_off = bytestream2_get_le16(&s->gb);
+    int y = 0;
    GetByteContext data_ptr;

    if (bytestream2_get_bytes_left(&s->gb) < data_off)