Commit 52dd4b6c authored by michael's avatar michael

Use CODEC_ID_PROBE when the mpeg-ps demuxer does not know exactly which

video codec is used.
Fixes issue49 Departed Trailer.evo (mpeg ps missdetecting h264 as mpeg2video)


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@14196 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 42dbaff0
...@@ -459,7 +459,7 @@ static int mpegps_read_packet(AVFormatContext *s, ...@@ -459,7 +459,7 @@ static int mpegps_read_packet(AVFormatContext *s,
if(!memcmp(buf, avs_seqh, 4) && (buf[6] != 0 || buf[7] != 1)) if(!memcmp(buf, avs_seqh, 4) && (buf[6] != 0 || buf[7] != 1))
codec_id = CODEC_ID_CAVS; codec_id = CODEC_ID_CAVS;
else else
codec_id = CODEC_ID_MPEG2VIDEO; codec_id = CODEC_ID_PROBE;
type = CODEC_TYPE_VIDEO; type = CODEC_TYPE_VIDEO;
} else if (startcode >= 0x1c0 && startcode <= 0x1df) { } else if (startcode >= 0x1c0 && startcode <= 0x1df) {
type = CODEC_TYPE_AUDIO; type = CODEC_TYPE_AUDIO;
......
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