From 0af1671e5318837e461cd3cb662832c216486fbb Mon Sep 17 00:00:00 2001 From: Peter Ross Date: Wed, 29 Dec 2010 10:43:16 +0000 Subject: wtv: only warn about unknown subtype, if it actually unknown Originally committed as revision 26123 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/wtv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavformat/wtv.c') diff --git a/libavformat/wtv.c b/libavformat/wtv.c index 1e9b055aa1..474179df98 100644 --- a/libavformat/wtv.c +++ b/libavformat/wtv.c @@ -244,9 +244,9 @@ static AVStream * parse_media_type(AVFormatContext *s, int sid, 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); -- cgit v1.2.3