summaryrefslogtreecommitdiff
path: root/libavformat/mpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-07-12 22:17:13 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-07-12 22:17:13 +0000
commitc1c9046656e976601284bce2f5630c5b958fdb68 (patch)
tree11406ca5500607fb02ae8dfdc022ea5cd4e9d909 /libavformat/mpeg.c
parent1b71f04586bc22ab1230091c5cd91a7cb7d7c89b (diff)
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) Originally committed as revision 14196 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mpeg.c')
-rw-r--r--libavformat/mpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 7c4f7d9313..78fceee373 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -459,7 +459,7 @@ static int mpegps_read_packet(AVFormatContext *s,
if(!memcmp(buf, avs_seqh, 4) && (buf[6] != 0 || buf[7] != 1))
codec_id = CODEC_ID_CAVS;
else
- codec_id = CODEC_ID_MPEG2VIDEO;
+ codec_id = CODEC_ID_PROBE;
type = CODEC_TYPE_VIDEO;
} else if (startcode >= 0x1c0 && startcode <= 0x1df) {
type = CODEC_TYPE_AUDIO;