[FFmpeg-cvslog] r26123 - trunk/libavformat/wtv.c

[pross]

Author: pross
Date: Wed Dec 29 11:43:16 2010
New Revision: 26123

Log:
wtv: only warn about unknown subtype, if it actually unknown

Modified:
   trunk/libavformat/wtv.c

Modified: trunk/libavformat/wtv.c
==============================================================================
--- trunk/libavformat/wtv.c	Wed Dec 29 04:49:02 2010	(r26122)
+++ trunk/libavformat/wtv.c	Wed Dec 29 11:43:16 2010	(r26123)
@@ -244,9 +244,9 @@ static AVStream * parse_media_type(AVFor
                 av_log(s, AV_LOG_WARNING, "MPEG1WAVEFORMATEX underflow\n");
         } else {
             st->codec->codec_id = ff_codec_guid_get_id(audio_guids, subtype);
+            if (st->codec->codec_id == CODEC_ID_NONE)
+                av_log(s, AV_LOG_WARNING, "unknown subtype:"PRI_GUID"\n", ARG_GUID(subtype));
         }
-        if (st->codec->codec_id == CODEC_ID_NONE)
-            av_log(s, AV_LOG_WARNING, "unknown subtype:"PRI_GUID"\n", ARG_GUID(subtype));
         return st;
     } else if (!ff_guidcmp(mediatype, mediatype_video)) {
         st = new_stream(s, sid, AVMEDIA_TYPE_VIDEO);