]> 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>
Sun, 12 Feb 2012 14:45:05 +0000 (14:45 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sun, 12 Feb 2012 14:45:05 +0000 (14:45 +0000)
modules/ffmpeg/producer/audio/audio_decoder.cpp
modules/ffmpeg/producer/video/video_decoder.cpp

index 84db66a97ce0ea3d167b9e919da185073aa6abdb..619ca4705b7bf9acfc5b6887f90c467584200f0d 100644 (file)
@@ -53,7 +53,7 @@ namespace caspar { namespace ffmpeg {
        \r
 struct audio_decoder::impl : boost::noncopyable\r
 {      \r
-       monitor::subject                                                                                        event_subject_;\r
+       monitor::basic_subject                                                                          event_subject_;\r
        int                                                                                                                     index_;\r
        const spl::shared_ptr<AVCodecContext>                                           codec_context_;         \r
        const core::video_format_desc                                                           format_desc_;\r
index 7ee3b833a16070880cc009a99fcdb4e4d75f254c..c7d2b773002760317d5906a2ea9e0da1d06feae1 100644 (file)
@@ -53,7 +53,7 @@ namespace caspar { namespace ffmpeg {
        \r
 struct video_decoder::impl : boost::noncopyable\r
 {\r
-       monitor::subject                                                event_subject_;\r
+       monitor::basic_subject                                  event_subject_;\r
        int                                                                             index_;\r
        const spl::shared_ptr<AVCodecContext>   codec_context_;\r
 \r