From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 2 Sep 2008 15:33:57 +0000 (+0000)
Subject: Fix detection of MPEG4 in MPEG-PS.
X-Git-Tag: v0.5~2743
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=74aa41bae4c3c57f3765633963719ea824bab410;p=platform%2Fupstream%2Flibav.git

Fix detection of MPEG4 in MPEG-PS.
Fixes issue568.

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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index c4ebf20..5c268c7 100644
--- 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;