OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1b71f04
)
Use CODEC_ID_PROBE when the mpeg-ps demuxer does not know exactly which
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 12 Jul 2008 22:17:13 +0000
(22:17 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 12 Jul 2008 22:17:13 +0000
(22:17 +0000)
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
libavformat/mpeg.c
patch
|
blob
|
history
diff --git
a/libavformat/mpeg.c
b/libavformat/mpeg.c
index
7c4f7d9
..
78fceee
100644
(file)
--- 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;