X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_subtitle_stream.cc;h=e500dd35b6294b91c6750ae6532ef3ae0fdddca1;hp=da8bafc0af788a3c76328b6b7ef5a54445f2c1f1;hb=2d4e8c5f69cc694625ad95dcee554499605f823b;hpb=bccf7c5c6ff50e25dff8e0e433b81379d8999f9b diff --git a/src/lib/ffmpeg_subtitle_stream.cc b/src/lib/ffmpeg_subtitle_stream.cc index da8bafc0a..e500dd35b 100644 --- a/src/lib/ffmpeg_subtitle_stream.cc +++ b/src/lib/ffmpeg_subtitle_stream.cc @@ -19,9 +19,11 @@ */ #include "ffmpeg_subtitle_stream.h" +#include "warnings.h" #include +DCPOMATIC_DISABLE_WARNINGS #include -#include +DCPOMATIC_ENABLE_WARNINGS #include using std::string; @@ -40,7 +42,7 @@ FFmpegSubtitleStream::FFmpegSubtitleStream (cxml::ConstNodePtr node, int version { if (version >= 33) { boost::mutex::scoped_lock lm (_mutex); - BOOST_FOREACH (cxml::NodePtr i, node->node_children ("Colour")) { + for (auto i: node->node_children ("Colour")) { _colours[RGBA(i->node_child("From"))] = RGBA (i->node_child("To")); } }