Imported Debian version 2.5.1~trusty

[deb_ffmpeg.git] / ffmpeg / libavformat / flvdec.c

diff --git a/ffmpeg/libavformat/flvdec.c b/ffmpeg/libavformat/flvdec.c
index 17d1313d60860471f7ebc08d849607564ffd3fcd..c64b3a9d927c662a01fca9aeb8ceced80cf22f12 100644 (file)
--- a/ffmpeg/libavformat/flvdec.c
+++ b/ffmpeg/libavformat/flvdec.c
@@ -459,11 +459,11 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream,
     }
 
     if (key) {
+        acodec = astream ? astream->codec : NULL;
+        vcodec = vstream ? vstream->codec : NULL;
+
         // stream info doesn't live any deeper than the first object
         if (depth == 1) {
-            acodec = astream ? astream->codec : NULL;
-            vcodec = vstream ? vstream->codec : NULL;
-
             if (amf_type == AMF_DATA_TYPE_NUMBER ||
                 amf_type == AMF_DATA_TYPE_BOOL) {
                 if (!strcmp(key, "duration"))