2.0. ffmpeg_producer: Fixed arithmetic overflow for length.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1263 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index d6ec0d8994eeb82a6c2a708d1666a23a585b6cbc..3b62cf40319dd8dcd5da9608260b8b039f39d56b 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -68,7 +68,7 @@ struct ffmpeg_producer : public core::frame_producer
        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
@@ -77,7 +77,7 @@ struct ffmpeg_producer : public core::frame_producer
        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
@@ -187,7 +187,7 @@ public:
                        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