OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e2bf00c
)
Ignore es_map_length when parsing mpeg program stream map.
author
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Thu, 5 Dec 2013 20:17:21 +0000
(21:17 +0100)
committer
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Thu, 5 Dec 2013 20:17:21 +0000
(21:17 +0100)
Fixes ticket #3195.
libavformat/mpeg.c
patch
|
blob
|
history
diff --git
a/libavformat/mpeg.c
b/libavformat/mpeg.c
index
90434a1
..
1777283
100644
(file)
--- a/
libavformat/mpeg.c
+++ b/
libavformat/mpeg.c
@@
-193,6
+193,8
@@
static long mpegps_psm_parse(MpegDemuxContext *m, AVIOContext *pb)
/* skip program_stream_info */
avio_skip(pb, ps_info_length);
es_map_length = avio_rb16(pb);
+ /* Ignore es_map_length, trust psm_length */
+ es_map_length = psm_length - ps_info_length - 10;
/* at least one es available? */
while (es_map_length >= 4){