]> git.sesse.net Git - casparcg/commitdiff
[ffmpeg_producer] Moved negation from method to operator ! for clarity.
authorHelge Norberg <helge.norberg@svt.se>
Thu, 13 Oct 2016 16:00:03 +0000 (18:00 +0200)
committerHelge Norberg <helge.norberg@svt.se>
Thu, 13 Oct 2016 16:00:03 +0000 (18:00 +0200)
modules/ffmpeg/producer/ffmpeg_producer.cpp

index a2d4afef0d204ca2c39a54e35fc9c99f2e07087e..48facf644a8e2a22696a433830bfb33ab396b48d 100644 (file)
@@ -521,20 +521,20 @@ public:
                                !video_decoder_->is_progressive()) : L"";
        }
 
-       bool not_all_audio_decoders_ready() const
+       bool all_audio_decoders_ready() const
        {
                for (auto& audio_decoder : audio_decoders_)
                        if (!audio_decoder->ready())
-                               return true;
+                               return false;
 
-               return false;
+               return true;
        }
 
        void try_decode_frame()
        {
                std::shared_ptr<AVPacket> pkt;
 
-               for (int n = 0; n < 32 && ((video_decoder_ && !video_decoder_->ready()) || not_all_audio_decoders_ready()) && input_.try_pop(pkt); ++n)
+               for (int n = 0; n < 32 && ((video_decoder_ && !video_decoder_->ready()) || !all_audio_decoders_ready()) && input_.try_pop(pkt); ++n)
                {
                        if (video_decoder_)
                                video_decoder_->push(pkt);