projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't scale chroma subsampled images to sizes that don't align with the subsampling...
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_stream.cc
diff --git
a/src/lib/ffmpeg_stream.cc
b/src/lib/ffmpeg_stream.cc
index 7a8748e4e3f762f9fe9ea8287b8d8cb6a09cc14f..2d85a90bb69fcf81bc595b2ec3f96439bb5b1de4 100644
(file)
--- 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 "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>
}
#include <libxml++/libxml++.h>
extern "C" {
#include <libavformat/avformat.h>
}
+DCPOMATIC_ENABLE_WARNINGS
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"))