]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
Add mpegvideo and H.264 to the codec probe.
authormichael <michael@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sat, 12 Jul 2008 19:56:25 +0000 (19:56 +0000)
committermichael <michael@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sat, 12 Jul 2008 19:56:25 +0000 (19:56 +0000)
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@14187 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavformat/utils.c

index eafeef9afa852f855228a9f908e6518df7f29bff..9f573d61c5f2d666ba055e6547f4b3e0a712c734 100644 (file)
@@ -303,6 +303,10 @@ static int set_codec_from_probe_data(AVStream *st, AVProbeData *pd, int score)
             st->codec->codec_id = CODEC_ID_MP3;
         else if (strncmp(fmt->name, "ac3", 3) == 0)
             st->codec->codec_id = CODEC_ID_AC3;
+        else if (!strcmp(fmt->name, "mpegvideo"))
+            st->codec->codec_id = CODEC_ID_MPEG2VIDEO;
+        else if (!strcmp(fmt->name, "h264"))
+            st->codec->codec_id = CODEC_ID_H264;
     }
     return !!fmt;
 }