]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sat, 7 Apr 2012 21:29:49 +0000 (21:29 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sat, 7 Apr 2012 21:29:49 +0000 (21:29 +0000)
modules/ffmpeg/producer/muxer/frame_muxer.cpp

index 6d8a1dfec8be38e7ca1a747d839db1a51905fb85..959838801ce8a74b98a1422a8cd59cbb33ff33e7 100644 (file)
@@ -98,6 +98,9 @@ struct frame_muxer::impl : boost::noncopyable
        \r
        void push_video(const std::shared_ptr<AVFrame>& video)\r
        {               \r
+               if(!video)\r
+                       return;\r
+\r
                if(!video->data[0])\r
                {\r
                        auto empty_frame = frame_factory_->create_frame(this, core::pixel_format_desc(core::pixel_format::invalid));\r
@@ -119,6 +122,9 @@ struct frame_muxer::impl : boost::noncopyable
        \r
        void push_audio(const std::shared_ptr<AVFrame>& audio)\r
        {\r
+               if(!audio)\r
+                       return;\r
+\r
                if(!audio->data[0])             \r
                {\r
                        boost::range::push_back(audio_stream_, core::audio_buffer(audio_cadence_.front(), 0));  \r