[FFmpeg-cvslog] r14966 - trunk/libavformat/utils.c

andoma subversion
Mon Aug 25 17:39:44 CEST 2008


Author: andoma
Date: Mon Aug 25 17:39:43 2008
New Revision: 14966

Log:
When setting codec_id during codec probe we must also set codec_type.



Modified:
   trunk/libavformat/utils.c

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	(original)
+++ trunk/libavformat/utils.c	Mon Aug 25 17:39:43 2008
@@ -352,14 +352,19 @@ static int set_codec_from_probe_data(AVS
     fmt = av_probe_input_format2(pd, 1, &score);
 
     if (fmt) {
-        if (!strcmp(fmt->name, "mp3"))
+        if (!strcmp(fmt->name, "mp3")) {
             st->codec->codec_id = CODEC_ID_MP3;
-        else if (!strcmp(fmt->name, "ac3"))
+            st->codec->codec_type = CODEC_TYPE_AUDIO;
+        } else if (!strcmp(fmt->name, "ac3")) {
             st->codec->codec_id = CODEC_ID_AC3;
-        else if (!strcmp(fmt->name, "mpegvideo"))
+            st->codec->codec_type = CODEC_TYPE_AUDIO;
+        } else if (!strcmp(fmt->name, "mpegvideo")) {
             st->codec->codec_id = CODEC_ID_MPEG2VIDEO;
-        else if (!strcmp(fmt->name, "h264"))
+            st->codec->codec_type = CODEC_TYPE_VIDEO;
+        } else if (!strcmp(fmt->name, "h264")) {
             st->codec->codec_id = CODEC_ID_H264;
+            st->codec->codec_type = CODEC_TYPE_VIDEO;
+        }
     }
     return !!fmt;
 }




More information about the ffmpeg-cvslog mailing list