Fix detection of MPEG4 in MPEG-PS.

Fixes issue568.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@15152 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavformat/utils.c b/libavformat/utils.c
index c4ebf2087b124b8a2dd518a5cd378bea2166aeb0..5c268c79a3c06cb38deff7caad957248a63f0497 100644 (file)
--- 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;