Commit 883c5a06 authored by michael's avatar michael

Fix detection of MPEG4 in MPEG-PS.

Fixes issue568.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@15152 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 1cfd6afe
...@@ -362,6 +362,9 @@ static int set_codec_from_probe_data(AVStream *st, AVProbeData *pd, int score) ...@@ -362,6 +362,9 @@ static int set_codec_from_probe_data(AVStream *st, AVProbeData *pd, int score)
} else if (!strcmp(fmt->name, "mpegvideo")) { } else if (!strcmp(fmt->name, "mpegvideo")) {
st->codec->codec_id = CODEC_ID_MPEG2VIDEO; st->codec->codec_id = CODEC_ID_MPEG2VIDEO;
st->codec->codec_type = CODEC_TYPE_VIDEO; 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")) { } else if (!strcmp(fmt->name, "h264")) {
st->codec->codec_id = CODEC_ID_H264; st->codec->codec_id = CODEC_ID_H264;
st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_type = CODEC_TYPE_VIDEO;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment