X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_stream.cc;h=dfd6f718c60007a3e8e60e84f75d3833450dfe54;hb=43494601da412259814fdb1345950329cc4aa849;hp=3fac3332752eda59f15816d64ba4b90d6b996dae;hpb=22b9f3b2090d8bdfe52cda1e69d3acbe874f1ce5;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_stream.cc b/src/lib/ffmpeg_stream.cc
index 3fac33327..dfd6f718c 100644
--- a/src/lib/ffmpeg_stream.cc
+++ b/src/lib/ffmpeg_stream.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,15 +17,15 @@
 
 */
 
+#include "ffmpeg_stream.h"
+#include "dcpomatic_assert.h"
+#include "raw_convert.h"
+#include <libxml++/libxml++.h>
 extern "C" {
 #include <libavformat/avformat.h>
 }
-#include <libxml++/libxml++.h>
-#include <dcp/raw_convert.h>
-#include "ffmpeg_stream.h"
 
 using std::string;
-using dcp::raw_convert;
 
 FFmpegStream::FFmpegStream (cxml::ConstNodePtr node)
 	: name (node->string_child ("Name"))
@@ -44,15 +44,7 @@ FFmpegStream::as_xml (xmlpp::Node* root) const
 bool
 FFmpegStream::uses_index (AVFormatContext const * fc, int index) const
 {
-	size_t i = 0;
-	while (i < fc->nb_streams) {
-		if (fc->streams[i]->id == _id) {
-			return int (i) == index;
-		}
-		++i;
-	}
-
-	return false;
+	return fc->streams[index]->id == _id;
 }
 
 AVStream *
@@ -66,6 +58,6 @@ FFmpegStream::stream (AVFormatContext const * fc) const
 		++i;
 	}
 
-	assert (false);
+	DCPOMATIC_ASSERT (false);
 	return 0;
 }