2.0.0.2:

[casparcg] / core / producer / ffmpeg / video / video_decoder.cpp

diff --git a/core/producer/ffmpeg/video/video_decoder.cpp b/core/producer/ffmpeg/video/video_decoder.cpp
index a0743c6c3c2ba511876294843f3c84cf7e85342f..edf8f304fd0412d69d009a829a4d07ea286e082f 100644 (file)
--- a/core/producer/ffmpeg/video/video_decoder.cpp
+++ b/core/producer/ffmpeg/video/video_decoder.cpp
@@ -28,10 +28,8 @@ struct video_decoder::implementation : boost::noncopyable
 \r
                int frame_finished = 0;\r
                const int result = avcodec_decode_video(codec_context_, decoded_frame.get(), &frame_finished, video_packet.data(), video_packet.size());\r
-               if(result < 0)                                          \r
-                       return nullptr;                 \r
                \r
-               return decoded_frame;           \r
+               return result >= 0 ? decoded_frame : nullptr;           \r
        }\r
        \r
        AVCodecContext* codec_context_;\r