Fix detection of MPEG4 in MPEG-PS.

Fixes issue568. Originally committed as revision 15152 to svn://svn.ffmpeg.org/ffmpeg/trunk

Fix detection of MPEG4 in MPEG-PS.
Fixes issue568. Originally committed as revision 15152 to svn://svn.ffmpeg.org/ffmpeg/trunk
74aa41ba · Michael Niedermayer · 406ab5cc · 74aa41ba
Commit 74aa41ba authored Sep 02, 2008 by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

utils.c libavformat/utils.c +3 -0

No files found.
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -362,6 +362,9 @@ static int set_codec_from_probe_data(AVStream *st, AVProbeData *pd, int score)
        } else if (!strcmp(fmt->name, "mpegvideo")) {
            st->codec->codec_id = CODEC_ID_MPEG2VIDEO;
            st->codec->codec_type = CODEC_TYPE_VIDEO;
+        } else if (!strcmp(fmt->name, "m4v")) {
+            st->codec->codec_id = CODEC_ID_MPEG4;
+            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;