projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix font_id_map errors when importing DCP subtitles that have no
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_subtitle_stream.cc
diff --git
a/src/lib/ffmpeg_subtitle_stream.cc
b/src/lib/ffmpeg_subtitle_stream.cc
index e500dd35b6294b91c6750ae6532ef3ae0fdddca1..1101901b7f1b20a83a192129b8361f5ce4d9cba5 100644
(file)
--- a/
src/lib/ffmpeg_subtitle_stream.cc
+++ b/
src/lib/ffmpeg_subtitle_stream.cc
@@
-19,11
+19,11
@@
*/
#include "ffmpeg_subtitle_stream.h"
*/
#include "ffmpeg_subtitle_stream.h"
-#include "warnings.h"
#include <dcp/raw_convert.h>
#include <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
#include <libxml++/libxml++.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
#include <iostream>
using std::string;
#include <iostream>
using std::string;