summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorcehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-09-25 22:34:01 +0000
committercehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-09-25 22:34:01 +0000
commite1fa5aef517ae3e63e44a28e4737f080cadc790e (patch)
tree145c43db3588979a07cb7a5b4d5e5927e17d7fb5 /libmpdemux
parent8ea2de1262d9e81f5a62da80b88dc5da2fa04efe (diff)
downloadmpv-e1fa5aef517ae3e63e44a28e4737f080cadc790e.tar.bz2
mpv-e1fa5aef517ae3e63e44a28e4737f080cadc790e.tar.xz
Fix playback of streams with more than one audio track (only one supported).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24618 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_rtp.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp
index 5d2698394f..ba9c77a0c3 100644
--- a/libmpdemux/demux_rtp.cpp
+++ b/libmpdemux/demux_rtp.cpp
@@ -164,6 +164,7 @@ extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) {
rtpState->firstSyncTime.tv_sec = rtpState->firstSyncTime.tv_usec = 0;
demuxer->priv = rtpState;
+ int audiofound = 0;
// Create RTP receivers (sources) for each subsession:
MediaSubsessionIterator iter(*mediaSession);
MediaSubsession* subsession;
@@ -171,6 +172,10 @@ extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) {
while ((subsession = iter.next()) != NULL) {
// Ignore any subsession that's not audio or video:
if (strcmp(subsession->mediumName(), "audio") == 0) {
+ if (audiofound) {
+ fprintf(stderr, "Additional subsession \"audio/%s\" skipped\n", subsession->codecName());
+ continue;
+ }
desiredReceiveBufferSize = 100000;
} else if (strcmp(subsession->mediumName(), "video") == 0) {
desiredReceiveBufferSize = 2000000;
@@ -203,6 +208,8 @@ extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) {
// Issue a RTSP "SETUP" command on the chosen subsession:
if (!rtspClient->setupMediaSubsession(*subsession, False,
rtspStreamOverTCP)) break;
+ if (!strcmp(subsession->mediumName(), "audio"))
+ audiofound = 1;
}
}
}