projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert...
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_stream.cc
diff --git
a/src/lib/ffmpeg_stream.cc
b/src/lib/ffmpeg_stream.cc
index 3fac3332752eda59f15816d64ba4b90d6b996dae..ad99defeef35852ca6e725965e70f6e78ac12031 100644
(file)
--- a/
src/lib/ffmpeg_stream.cc
+++ b/
src/lib/ffmpeg_stream.cc
@@
-17,12
+17,13
@@
*/
*/
+#include "ffmpeg_stream.h"
+#include "dcpomatic_assert.h"
+#include <dcp/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 dcp::raw_convert;
using std::string;
using dcp::raw_convert;
@@
-66,6
+67,6
@@
FFmpegStream::stream (AVFormatContext const * fc) const
++i;
}
++i;
}
-
assert
(false);
+
DCPOMATIC_ASSERT
(false);
return 0;
}
return 0;
}