git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1263
362d55ac-95cf-4e76-9f9a-
cbaa9c17b72d
int late_frames_;\r
const int start_;\r
const bool loop_;\r
int late_frames_;\r
const int start_;\r
const bool loop_;\r
- const int64_t length_;\r
+ const size_t length_;\r
\r
safe_ptr<core::basic_frame> last_frame_;\r
\r
\r
safe_ptr<core::basic_frame> last_frame_;\r
\r
bool is_progressive_;\r
\r
public:\r
bool is_progressive_;\r
\r
public:\r
- explicit ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filename, const std::wstring& filter, bool loop, int start, int length) \r
+ explicit ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filename, const std::wstring& filter, bool loop, int start, size_t length) \r
: filename_(filename)\r
, graph_(diagnostics::create_graph([this]{return print();}))\r
, frame_factory_(frame_factory) \r
: filename_(filename)\r
, graph_(diagnostics::create_graph([this]{return print();}))\r
, frame_factory_(frame_factory) \r
int64_t video_nb_frames = video_decoder_.nb_frames();\r
int64_t audio_nb_frames = audio_decoder_.nb_frames();\r
\r
int64_t video_nb_frames = video_decoder_.nb_frames();\r
int64_t audio_nb_frames = audio_decoder_.nb_frames();\r
\r
- nb_frames = std::min(length_, std::max(nb_frames, std::max(video_nb_frames, audio_nb_frames)));\r
+ nb_frames = std::min(static_cast<int64_t>(length_), std::max(nb_frames, std::max(video_nb_frames, audio_nb_frames)));\r
}\r
\r
nb_frames = muxer_.calc_nb_frames(nb_frames);\r
}\r
\r
nb_frames = muxer_.calc_nb_frames(nb_frames);\r