]> 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>
Mon, 12 Mar 2012 15:26:21 +0000 (15:26 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Mon, 12 Mar 2012 15:26:21 +0000 (15:26 +0000)
modules/decklink/producer/decklink_producer.cpp

index b5a6a9e0a0d95d9e272ed466dffe7778fafd7108..aa5ec3713c26489ee05cc2b5a5afdfe3433029b4 100644 (file)
@@ -196,7 +196,7 @@ public:
                        if(FAILED(video->GetBytes(&bytes)) || !bytes)\r
                                return S_OK;\r
                        \r
-                       spl::shared_ptr<AVFrame> av_frame(avcodec_alloc_frame(), av_free);      \r
+                       std::shared_ptr<AVFrame> av_frame(avcodec_alloc_frame(), av_free);      \r
                        avcodec_get_frame_defaults(av_frame.get());\r
                                                \r
                        av_frame->data[0]                       = reinterpret_cast<uint8_t*>(bytes);\r
@@ -239,8 +239,8 @@ public:
                                return S_OK;\r
                        }\r
                        \r
-                       muxer_.push_video(av_frame);    \r
-                       muxer_.push_audio(audio_buffer);\r
+                       muxer_.push(av_frame);  \r
+                       muxer_.push(audio_buffer);\r
                                                                                        \r
                        boost::range::rotate(audio_cadence_, std::begin(audio_cadence_)+1);\r
                        \r