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.

stuartm · stuartm · commit 322de47d5b10 · 2012-03-15T14:10:31.000Z
(cherry picked from commit 20a5628)
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -1347,7 +1347,7 @@ uint8_t DVDRingBufferPriv::GetNumAudioChannels(int id)`
`1347`	`1347`	`unsigned char channels = dvdnav_audio_stream_channels(m_dvdnav, id);`
`1348`	`1348`	`if (channels == 0xff)`
`1349`	`1349`	`return 0;`
`1350`		`- return (uint8_t)channels + 1;`
	`1350`	`+ return (uint8_t)channels;`
`1351`	`1351`	`}`
`1352`	`1352`
`1353`	`1353`	`/** \brief Get the dvd title and serial num`