Merge commit '2de7650451d90520135d8cf6f96caa0658824208'

[ffmpeg] / libavformat / matroskadec.c

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index d869e5381e5b66ea5d202f30ef823ede03c45f13..396c1de9b891d04f5d74aa86cb5b117ad310d6f8 100644 (file)
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2159,6 +2159,8 @@ static int matroska_read_header(AVFormatContext *s)
                 }
             }
 
+            attachments[j].stream = st;
+
             if (st->codec->codec_id != AV_CODEC_ID_NONE) {
                 st->disposition      |= AV_DISPOSITION_ATTACHED_PIC;
                 st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
@@ -2174,7 +2176,7 @@ static int matroska_read_header(AVFormatContext *s)
                 if (ff_alloc_extradata(st->codec, attachments[j].bin.size))
                     break;
                 memcpy(st->codec->extradata, attachments[j].bin.data,
-                    attachments[j].bin.size);
+                       attachments[j].bin.size);
 
                 for (i = 0; ff_mkv_mime_tags[i].id != AV_CODEC_ID_NONE; i++) {
                     if (!strncmp(ff_mkv_mime_tags[i].str, attachments[j].mime,
@@ -2183,7 +2185,6 @@ static int matroska_read_header(AVFormatContext *s)
                         break;
                     }
                 }
-                attachments[j].stream = st;
             }
         }
     }