ffmpeg update

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.2@1631 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/dlls/avcodec-53.dll b/dlls/avcodec-53.dll
index 59a01c7d07745b2e4c8648616716e1659fc60d83..01366c1f37db3a4c4317327566d72d9448699891 100644 (file)
Binary files a/dlls/avcodec-53.dll and b/dlls/avcodec-53.dll differ

diff --git a/dlls/avdevice-53.dll b/dlls/avdevice-53.dll
index cadd1b0e8d20029eda4d38e4444200ee3a1f529b..9986ce07458b67743ef98a820e5cf9cb31d18850 100644 (file)
Binary files a/dlls/avdevice-53.dll and b/dlls/avdevice-53.dll differ

diff --git a/dlls/avfilter-2.dll b/dlls/avfilter-2.dll
index 24f5f2c5bd1afcda9c9aba7b4b785086daac9b10..5e863990cf0e9c4742f62e6c4e9c64a16dfa8d0e 100644 (file)
Binary files a/dlls/avfilter-2.dll and b/dlls/avfilter-2.dll differ

diff --git a/dlls/avformat-53.dll b/dlls/avformat-53.dll
index d1c9f63f803c980324dfe9d44422699e7a005119..082d4d26b5f73138d882b4ac8baf7da7ad6d21ef 100644 (file)
Binary files a/dlls/avformat-53.dll and b/dlls/avformat-53.dll differ

diff --git a/dlls/avutil-51.dll b/dlls/avutil-51.dll
index 7cf986c23ee6d339c19fc4fbef8f05a141657ca0..647fa1a066fe10ed77cd7ea1a3e716a4de14f41b 100644 (file)
Binary files a/dlls/avutil-51.dll and b/dlls/avutil-51.dll differ

diff --git a/dlls/postproc-51.dll b/dlls/postproc-51.dll
index 55860cdd450a1d82ccdc815cbbe201aeeccbd277..3c519f6c38e4558955e5ead0047e581d9913ebe1 100644 (file)
Binary files a/dlls/postproc-51.dll and b/dlls/postproc-51.dll differ

diff --git a/dlls/swresample-0.dll b/dlls/swresample-0.dll
index 0b43fede09a5675a4e1fdd66981d24578d90ccfa..1f3215c68d676c6775fbfdbc3ed2c98b039c8992 100644 (file)
Binary files a/dlls/swresample-0.dll and b/dlls/swresample-0.dll differ

diff --git a/dlls/swscale-2.dll b/dlls/swscale-2.dll
index 6f9bfddde68d9c069898b87d91300bf7b1c6b7b6..92fe03ef7017458514d18cb192780e1f684c8e0e 100644 (file)
Binary files a/dlls/swscale-2.dll and b/dlls/swscale-2.dll differ

diff --git a/modules/decklink/interop/DeckLinkAPI_h.h b/modules/decklink/interop/DeckLinkAPI_h.h
index f864d99d7ebc05190a3acce91dd76300962c1e94..cc4a2b35b2dcf034eb6ea2cc29c100c61d430c50 100644 (file)
--- a/modules/decklink/interop/DeckLinkAPI_h.h
+++ b/modules/decklink/interop/DeckLinkAPI_h.h
@@ -4,7 +4,7 @@
 \r
 \r
  /* File created by MIDL compiler version 7.00.0555 */\r
-/* at Sat Nov 19 12:16:19 2011\r
+/* at Wed Nov 23 08:55:00 2011\r
  */\r
 /* Compiler settings for interop\DeckLinkAPI.idl:\r
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 \r

diff --git a/modules/decklink/interop/DeckLinkAPI_i.c b/modules/decklink/interop/DeckLinkAPI_i.c
index 28631dc19b80873c4ca7344e7bc6952c96bced19..9b2e362551bcc2ad62a1f28df714040b8765db86 100644 (file)
--- a/modules/decklink/interop/DeckLinkAPI_i.c
+++ b/modules/decklink/interop/DeckLinkAPI_i.c
@@ -6,7 +6,7 @@
 \r
 \r
  /* File created by MIDL compiler version 7.00.0555 */\r
-/* at Sat Nov 19 12:16:19 2011\r
+/* at Wed Nov 23 08:55:00 2011\r
  */\r
 /* Compiler settings for interop\DeckLinkAPI.idl:\r
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 \r

diff --git a/modules/ffmpeg/producer/filter/filter.cpp b/modules/ffmpeg/producer/filter/filter.cpp
index 23eb0af8bfbd4c1485ca69309afaeffa1a4ac8cb..c25de7db47c7550c10dec8c3bc8c1ed96dce2820 100644 (file)
--- a/modules/ffmpeg/producer/filter/filter.cpp
+++ b/modules/ffmpeg/producer/filter/filter.cpp
@@ -94,10 +94,9 @@ struct filter::implementation
                                        args << frame->width << ":" << frame->height << ":" << frame->format << ":" << 0 << ":" << 0 << ":" << 0 << ":" << 0; // don't care about pts and aspect_ratio\r
                                        THROW_ON_ERROR2(avfilter_graph_create_filter(&buffersrc_ctx_, avfilter_get_by_name("buffer"), "src", args.str().c_str(), NULL, graph_.get()), "[filter]");\r
 \r
-                                       // OPIX_FMT_BGRAutput\r
-                                       safe_ptr<AVBufferSinkParams> buffersink_params(av_buffersink_params_alloc(), av_free);\r
-                                       buffersink_params->pixel_fmts = pix_fmts_.data();\r
-                                       THROW_ON_ERROR2(avfilter_graph_create_filter(&buffersink_ctx_, avfilter_get_by_name("buffersink"), "out", NULL, buffersink_params.get(), graph_.get()), "[filter]");\r
+                                       //safe_ptr<AVBufferSinkParams> buffersink_params(av_buffersink_params_alloc(), av_free);\r
+                                       //buffersink_params->pixel_fmts = pix_fmts_.data();\r
+                                       THROW_ON_ERROR2(avfilter_graph_create_filter(&buffersink_ctx_, avfilter_get_by_name("buffersink"), "out", NULL, pix_fmts_.data(), graph_.get()), "[filter]");\r
                        \r
                                        AVFilterInOut* outputs = avfilter_inout_alloc();\r
                                        AVFilterInOut* inputs  = avfilter_inout_alloc();\r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index b1484b5304930fb449b7b8ad3ee8942eeded63ee..599be49f580f39fe0c5227eac99e0b0b7426d577 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -13,9 +13,8 @@
     <channel>\r
       <video-mode>PAL</video-mode>\r
       <consumers>\r
-        <decklink>\r
-          <embedded-audio>true</embedded-audio>\r
-        </decklink>\r
+        <screen></screen>\r
+        <decklink></decklink>\r
         <system-audio></system-audio>\r
       </consumers>\r
     </channel>\r