projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wake UI with a wxEVT_IDLE which is the event that SignalManager::ui_idle is tied to.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_stream.cc
diff --git
a/src/lib/ffmpeg_stream.cc
b/src/lib/ffmpeg_stream.cc
index 3fac3332752eda59f15816d64ba4b90d6b996dae..dfd6f718c60007a3e8e60e84f75d3833450dfe54 100644
(file)
--- a/
src/lib/ffmpeg_stream.cc
+++ b/
src/lib/ffmpeg_stream.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
5
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
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>
}
extern "C" {
#include <libavformat/avformat.h>
}
-#include <libxml++/libxml++.h>
-#include <dcp/raw_convert.h>
-#include "ffmpeg_stream.h"
using std::string;
using std::string;
-using dcp::raw_convert;
FFmpegStream::FFmpegStream (cxml::ConstNodePtr node)
: name (node->string_child ("Name"))
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
{
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 *
}
AVStream *
@@
-66,6
+58,6
@@
FFmpegStream::stream (AVFormatContext const * fc) const
++i;
}
++i;
}
-
assert
(false);
+
DCPOMATIC_ASSERT
(false);
return 0;
}
return 0;
}