summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-02-21 10:25:00 +0000
committerCarl Hetherington <cth@carlh.net>2014-02-21 10:25:00 +0000
commitcd34ac8e2e5a835b5907a8a67b241e29240eb7b9 (patch)
treefbefd9b43461831084178c43a4eb352e4fe7aac3 /src/lib/ffmpeg_content.cc
parent353507afb5ed4249d554a4e8e7e78d9076fb0e40 (diff)
Another small clean-up.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
-rw-r--r--src/lib/ffmpeg_content.cc10
1 files changed, 5 insertions, 5 deletions
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 *