X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_stream.cc;h=2d85a90bb69fcf81bc595b2ec3f96439bb5b1de4;hb=c29de33e6f8b20219a957a0cd88d61fd8cba1ad9;hp=085c78fa8427d21d1f367143bcf90d11c07bcd41;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_stream.cc b/src/lib/ffmpeg_stream.cc
index 085c78fa8..2d85a90bb 100644
--- a/src/lib/ffmpeg_stream.cc
+++ b/src/lib/ffmpeg_stream.cc
@@ -20,13 +20,17 @@
 
 #include "ffmpeg_stream.h"
 #include "dcpomatic_assert.h"
-#include "raw_convert.h"
+#include "warnings.h"
+#include <dcp/raw_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
 extern "C" {
 #include <libavformat/avformat.h>
 }
+DCPOMATIC_ENABLE_WARNINGS
 
 using std::string;
+using dcp::raw_convert;
 
 FFmpegStream::FFmpegStream (cxml::ConstNodePtr node)
 	: name (node->string_child ("Name"))
@@ -62,3 +66,18 @@ FFmpegStream::stream (AVFormatContext const * fc) const
 	DCPOMATIC_ASSERT (false);
 	return 0;
 }
+
+int
+FFmpegStream::index (AVFormatContext const * fc) const
+{
+	size_t i = 0;
+	while (i < fc->nb_streams) {
+		if (fc->streams[i]->id == _id) {
+			return i;
+		}
+		++i;
+	}
+
+	DCPOMATIC_ASSERT (false);
+	return 0;
+}