git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.cpp b/modules/ffmpeg/producer/audio/audio_decoder.cpp
index d02f4a901cd7f0c9ed8492c6c06878456a5439b4..4323574e5f30ecc853c6cb27d7921898a7277d5d 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.cpp
+++ b/modules/ffmpeg/producer/audio/audio_decoder.cpp
@@ -107,7 +107,7 @@ public:
                        avcodec_flush_buffers(codec_context_.get());\r
                        return nullptr;\r
                }\r
-               else if(packet == eof_packet())\r
+               else if(packet == null_packet())\r
                {\r
                        if(codec_context_->codec->capabilities & CODEC_CAP_DELAY)\r
                        {\r

diff --git a/modules/ffmpeg/producer/input/input.cpp b/modules/ffmpeg/producer/input/input.cpp
index 7967c672f22efdbef65fe69265864945f40e4782..c190fa02223448db1406364e2dad4860fee22303 100644 (file)
--- a/modules/ffmpeg/producer/input/input.cpp
+++ b/modules/ffmpeg/producer/input/input.cpp
@@ -78,7 +78,7 @@ public:
        \r
        void push(const std::shared_ptr<AVPacket>& packet)\r
        {\r
-               if(packet->stream_index != index_ && packet != flush_packet() && packet != eof_packet())\r
+               if(packet->stream_index != index_ && packet != flush_packet() && packet != null_packet())\r
                        return;\r
 \r
                packets_.push(packet);\r
@@ -233,8 +233,11 @@ struct input::impl : boost::noncopyable
                \r
                                if(is_eof(ret))                                                                                                              \r
                                {\r
-                                       video_stream_.push(eof_packet());\r
-                                       audio_stream_.push(eof_packet());\r
+                                       for(int n = 0; n < 3; ++n)\r
+                                       {\r
+                                               video_stream_.push(null_packet());\r
+                                               audio_stream_.push(null_packet());\r
+                                       }\r
 \r
                                        if(loop_)\r
                                        {\r

diff --git a/modules/ffmpeg/producer/util/util.cpp b/modules/ffmpeg/producer/util/util.cpp
index 4d35540bb050019bc1d27aa995adbba265acddf8..515810bf33194b582374fbfea4b2faeacddba218 100644 (file)
--- a/modules/ffmpeg/producer/util/util.cpp
+++ b/modules/ffmpeg/producer/util/util.cpp
@@ -93,7 +93,7 @@ spl::shared_ptr<AVPacket> flush_packet()
        return pkt;\r
 }\r
 \r
-spl::shared_ptr<AVPacket> eof_packet()\r
+spl::shared_ptr<AVPacket> null_packet()\r
 {\r
        static spl::shared_ptr<AVPacket> pkt(new AVPacket());\r
        return pkt;\r

diff --git a/modules/ffmpeg/producer/util/util.h b/modules/ffmpeg/producer/util/util.h
index 1ded43d1c319076e8431210a93f8120d926d0302..5ceff326ffeeb81d0ee8525bb24ceac8986fe5da 100644 (file)
--- a/modules/ffmpeg/producer/util/util.h
+++ b/modules/ffmpeg/producer/util/util.h
@@ -49,7 +49,7 @@ std::shared_ptr<AVFrame>                      flush_video();
 std::shared_ptr<AVFrame>                       empty_video();\r
 \r
 spl::shared_ptr<AVPacket>                      flush_packet(); \r
-spl::shared_ptr<AVPacket>                      eof_packet();                   \r
+spl::shared_ptr<AVPacket>                      null_packet();                  \r
 \r
 // Utils\r
 \r

diff --git a/modules/ffmpeg/producer/video/video_decoder.cpp b/modules/ffmpeg/producer/video/video_decoder.cpp
index 30fa79c8b3c2041d548ff58ccb097e586294c1f4..b8d01a6bee6acf668b2a7b076fe7761f2bcbd6af 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.cpp
+++ b/modules/ffmpeg/producer/video/video_decoder.cpp
@@ -105,7 +105,7 @@ public:
                        avcodec_flush_buffers(codec_context_.get());\r
                        return nullptr;\r
                }\r
-               else if(packet == eof_packet())\r
+               else if(packet == null_packet())\r
                {\r
                        if(codec_context_->codec->capabilities & CODEC_CAP_DELAY)\r
                        {\r