diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-09-02 15:33:57 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-09-02 15:33:57 +0000 |
| commit | 74aa41bae4c3c57f3765633963719ea824bab410 (patch) | |
| tree | c4839c3878c8406e81c5503df05837afb4d6fe77 /libavformat/utils.c | |
| parent | 406ab5cc97e3b2552c9f18d39efd76b4dc3e2f51 (diff) | |
Fix detection of MPEG4 in MPEG-PS.
Fixes issue568.
Originally committed as revision 15152 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index c4ebf2087b..5c268c79a3 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; |