mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 20:19:55 +00:00
Fix detection of MPEG4 in MPEG-PS.
Fixes issue568. Originally committed as revision 15152 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
406ab5cc97
commit
74aa41bae4
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user