aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-05-27 01:29:55 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-05-27 01:29:55 +0000
commit6c7c2f7bb3cdb3b1484bff00572c905f63965fc2 (patch)
tree1cab21b352fca60bb1969d77085160e2c856b9a9
parentbdfa98249a5d7c281702b0f8468428a9c263be97 (diff)
downloadffmpeg-6c7c2f7bb3cdb3b1484bff00572c905f63965fc2.tar.gz
support AVDISCARD_ALL in mpegts demuxer
Originally committed as revision 18964 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/mpegts.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 2b983a57e8..ab1c42e1b3 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -869,7 +869,7 @@ static int mpegts_push_data(MpegTSFilter *filter,
pes->header[2] == 0x01) {
/* it must be an mpeg2 PES stream */
code = pes->header[3] | 0x100;
- if (!pes->st ||
+ if (!pes->st || pes->st->discard == AVDISCARD_ALL ||
!((code >= 0x1c0 && code <= 0x1df) ||
(code >= 0x1e0 && code <= 0x1ef) ||
(code == 0x1bd) || (code == 0x1fd)))