X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg.cc;h=316b9614de6f27bb18b26278e2fd21006e65d95f;hb=bb0a36c3a6bea9cd1ebdde7b8a3a04765e317569;hp=5fc33348923c85d584af16fb980c6f5f50ad2dd1;hpb=a79d78d8bb6d51f6662f1f63b9f8fd19e1a0c5f1;p=dcpomatic.git diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc index 5fc333489..316b9614d 100644 --- a/src/lib/ffmpeg.cc +++ b/src/lib/ffmpeg.cc @@ -21,8 +21,8 @@ extern "C" { #include #include #include -#include } +#include #include "ffmpeg.h" #include "ffmpeg_content.h" #include "exceptions.h" @@ -34,7 +34,7 @@ using std::string; using std::cout; using std::stringstream; using boost::shared_ptr; -using boost::lexical_cast; +using dcp::raw_convert; boost::mutex FFmpeg::_mutex; @@ -95,8 +95,8 @@ FFmpeg::setup_general () /* These durations are in microseconds, and represent how far into the content file we will look for streams. */ - av_dict_set (&options, "analyzeduration", lexical_cast (5 * 60 * 1e6).c_str(), 0); - av_dict_set (&options, "probesize", lexical_cast (5 * 60 * 1e6).c_str(), 0); + av_dict_set (&options, "analyzeduration", raw_convert (5 * 60 * 1000000).c_str(), 0); + av_dict_set (&options, "probesize", raw_convert (5 * 60 * 1000000).c_str(), 0); if (avformat_open_input (&_format_context, 0, 0, &options) < 0) { throw OpenFileError (_ffmpeg_content->path(0).string ());