summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_ts.c
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-17 21:26:30 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-17 21:26:30 +0000
commit73f0dec4895eea54f725f738bd0796228e395130 (patch)
tree7c4a4c28f597ae6bd91b88a324434fb2945d6a1c /libmpdemux/demux_ts.c
parentfea44741eb18b3e284a63655d63780e6342c248e (diff)
downloadmpv-73f0dec4895eea54f725f738bd0796228e395130.tar.bz2
mpv-73f0dec4895eea54f725f738bd0796228e395130.tar.xz
fixed corner case previously mishandled: don't play an audio only stream when
-nosound is specified git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20289 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_ts.c')
-rw-r--r--libmpdemux/demux_ts.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c
index 8152883679..7d4d2a3dfd 100644
--- a/libmpdemux/demux_ts.c
+++ b/libmpdemux/demux_ts.c
@@ -580,7 +580,7 @@ static off_t ts_detect_streams(demuxer_t *demuxer, tsdemux_init_t *param)
{
//Non PES-aligned A52 audio may escape detection if PMT is not present;
//in this case we try to find at least 3 A52 syncwords
- if((es.type == PES_PRIVATE1) && (! audio_found))
+ if((es.type == PES_PRIVATE1) && (! audio_found) && req_apid > -2)
{
pptr = &pes_priv1[es.pid];
if(pptr->pos < 64*1024)
@@ -608,6 +608,8 @@ static off_t ts_detect_streams(demuxer_t *demuxer, tsdemux_init_t *param)
if((! is_audio) && (! is_video) && (! is_sub))
continue;
+ if(is_audio && req_apid==-2)
+ continue;
if(is_video)
{