summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStuart Morgan <smorgan@mythtv.org>2012-03-15 14:04:56 (GMT)
committer Stuart Morgan <smorgan@mythtv.org>2012-03-15 14:10:31 (GMT)
commit322de47d5b10a4d6f357a5941c0f690eb01a98ec (patch)
treebd9a944e49c077af7d4aaf4266a0d0f9c0bedf90
parent7b992ca8f74e4243e8ade724c391d1e9bf6bffd2 (diff)
Don't increment the number of channels returned by libdvdnav. This was causing 5.1 audio to be wrongly identified as 7 channel, and stereo as 3 channel.
(cherry picked from commit 20a5628e37a8d6f73d2d01e339e9aba82c484025)
-rw-r--r--mythtv/libs/libmythtv/DVDRingBuffer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/mythtv/libs/libmythtv/DVDRingBuffer.cpp b/mythtv/libs/libmythtv/DVDRingBuffer.cpp
index 7148eb4..3705597 100644
--- a/mythtv/libs/libmythtv/DVDRingBuffer.cpp
+++ b/mythtv/libs/libmythtv/DVDRingBuffer.cpp
@@ -1347,7 +1347,7 @@ uint8_t DVDRingBufferPriv::GetNumAudioChannels(int id)
unsigned char channels = dvdnav_audio_stream_channels(m_dvdnav, id);
if (channels == 0xff)
return 0;
- return (uint8_t)channels + 1;
+ return (uint8_t)channels;
}
/** \brief Get the dvd title and serial num