summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-29 23:10:01 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-29 23:10:01 +0000
commit4d31f5e2ea77709666a5478af7c1d98bbba3bd96 (patch)
tree61dfe597419c9ea124c01e8f338a6ce3a72c5752 /libmpdemux
parent9b9485027e4f9107b31b9af6dc58cb039815301d (diff)
downloadmpv-4d31f5e2ea77709666a5478af7c1d98bbba3bd96.tar.bz2
mpv-4d31f5e2ea77709666a5478af7c1d98bbba3bd96.tar.xz
5l, check that the codec type detected by ts_detect_streams() is actually audio before fixing it in the array
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22067 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_ts.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c
index 8d8a5795d8..afcf04439d 100644
--- a/libmpdemux/demux_ts.c
+++ b/libmpdemux/demux_ts.c
@@ -1010,7 +1010,7 @@ static demuxer_t *demux_open_ts(demuxer_t * demuxer)
{
ES_stream_t *es = priv->ts.pids[params.apid];
- if(!IS_AUDIO(es->type) && !IS_AUDIO(es->subtype)) es->subtype = params.atype;
+ if(!IS_AUDIO(es->type) && !IS_AUDIO(es->subtype) && IS_AUDIO(params.atype)) es->subtype = params.atype;
ts_add_stream(demuxer, priv->ts.pids[params.apid]);
sh_audio = priv->ts.streams[params.apid].sh;
demuxer->audio->id = priv->ts.streams[params.apid].id;