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

[michael]

Author: michael
Date: Tue Sep  2 17:33:57 2008
New Revision: 15152

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


Modified:
   trunk/libavformat/utils.c

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	(original)
+++ trunk/libavformat/utils.c	Tue Sep  2 17:33:57 2008
@@ -362,6 +362,9 @@ static int set_codec_from_probe_data(AVS
         } 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;