Report "unknown codec" instead of "unspecifed size" if the codec is unknown.
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Sun, 1 Jun 2014 17:40:56 +0000 (19:40 +0200)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Mon, 2 Jun 2014 06:33:40 +0000 (08:33 +0200)
libavformat/utils.c

index 1f72241..6df426b 100644 (file)
@@ -2644,6 +2644,9 @@ static int has_codec_parameters(AVStream *st, const char **errmsg_ptr)
         return 0;                                                 \
     } while (0)
 
+    if (   avctx->codec_id == AV_CODEC_ID_NONE
+        && avctx->codec_type != AVMEDIA_TYPE_DATA)
+        FAIL("unknown codec");
     switch (avctx->codec_type) {
     case AVMEDIA_TYPE_AUDIO:
         if (!avctx->frame_size && determinable_frame_size(avctx))
@@ -2675,8 +2678,6 @@ static int has_codec_parameters(AVStream *st, const char **errmsg_ptr)
         if (avctx->codec_id == AV_CODEC_ID_NONE) return 1;
     }
 
-    if (avctx->codec_id == AV_CODEC_ID_NONE)
-        FAIL("unknown codec");
     return 1;
 }