From cd34ac8e2e5a835b5907a8a67b241e29240eb7b9 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 21 Feb 2014 10:25:00 +0000
Subject: Another small clean-up.

---
 src/lib/ffmpeg_content.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/lib/ffmpeg_content.cc')

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 221a262ef..2c888baaf 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -393,22 +393,22 @@ FFmpegAudioStream::as_xml (xmlpp::Node* root) const
 	mapping.as_xml (root->add_child("Mapping"));
 }
 
-int
-FFmpegStream::index (AVFormatContext const * fc) const
+bool
+FFmpegStream::uses_index (AVFormatContext const * fc, int index) const
 {
 	if (_legacy_id) {
-		return id;
+		return id == index;
 	}
 	
 	size_t i = 0;
 	while (i < fc->nb_streams) {
 		if (fc->streams[i]->id == id) {
-			return i;
+			return int (i) == index;
 		}
 		++i;
 	}
 
-	assert (false);
+	return false;
 }
 
 AVStream *
-- 
cgit v1.2.3