From ce82977ea152ea617b2e6c005b2bcfedb2a0e85c Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 9 Jan 2014 21:28:43 -0500
Subject: VIDEO: Improve support for multiple Bink audio tracks

---
 video/bink_decoder.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'video/bink_decoder.cpp')

diff --git a/video/bink_decoder.cpp b/video/bink_decoder.cpp
index 45dec0887b..bad34e8373 100644
--- a/video/bink_decoder.cpp
+++ b/video/bink_decoder.cpp
@@ -214,6 +214,16 @@ void BinkDecoder::readNextPacket() {
 	frame.bits = 0;
 }
 
+VideoDecoder::AudioTrack *BinkDecoder::getAudioTrack(int index) {
+	// Bink audio track indexes are relative to the first audio track
+	Track *track = getTrack(index + 1);
+
+	if (!track || track->getTrackType() != Track::kTrackTypeAudio)
+		return 0;
+
+	return (AudioTrack *)track;
+}
+
 BinkDecoder::VideoFrame::VideoFrame() : bits(0) {
 }
 
-- 
cgit v1.2.3


From 8f3a923686a5a29e8affff2b624deff35938d5dc Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 18 Feb 2014 02:34:27 +0100
Subject: VIDEO: Make GPL headers consistent in themselves.

---
 video/bink_decoder.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'video/bink_decoder.cpp')

diff --git a/video/bink_decoder.cpp b/video/bink_decoder.cpp
index bad34e8373..be4dc549a4 100644
--- a/video/bink_decoder.cpp
+++ b/video/bink_decoder.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-- 
cgit v1.2.3