]> git.sesse.net Git - casparcg/blobdiff - modules/ffmpeg/producer/input.cpp
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
[casparcg] / modules / ffmpeg / producer / input.cpp
index ec661bcfa48a75958c7d76059c82a23705c996aa..47f6ebf7489e98212a1c871c28d0bb0bb892985a 100644 (file)
@@ -227,7 +227,7 @@ private:
                }\r
                else\r
                {               \r
-                       THROW_ON_ERROR(ret, print(), "av_read_frame");\r
+                       THROW_ON_ERROR(ret, "av_read_frame", print());\r
 \r
                        if(read_packet->stream_index == default_stream_index_)\r
                        {\r
@@ -287,7 +287,7 @@ input::input(const safe_ptr<diagnostics::graph>& graph, const std::wstring& file
        : impl_(new implementation(graph, filename, loop, start, length)){}\r
 bool input::eof() const {return !impl_->is_running_;}\r
 bool input::try_pop(std::shared_ptr<AVPacket>& packet){return impl_->try_pop(packet);}\r
-safe_ptr<AVFormatContext> input::context(){return make_safe(impl_->format_context_);}\r
+safe_ptr<AVFormatContext> input::context(){return make_safe_ptr(impl_->format_context_);}\r
 size_t input::nb_frames() const {return impl_->nb_frames();}\r
 size_t input::nb_loops() const {return impl_->nb_loops();}\r
-}}
\ No newline at end of file
+}}\r