2.0.0.2: Updated ffmpeg.

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

diff --git a/dlls/avcodec-53.dll b/dlls/avcodec-53.dll
index 6d2bd040cdac83a589d23f3e10be8f7820c20765..59a01c7d07745b2e4c8648616716e1659fc60d83 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
new file mode 100644 (file)
index 0000000..cadd1b0
Binary files /dev/null and b/dlls/avdevice-53.dll differ

diff --git a/dlls/avfilter-2.dll b/dlls/avfilter-2.dll
index eb327d8219525bf4fd530c8f1bf7ce399e074fba..24f5f2c5bd1afcda9c9aba7b4b785086daac9b10 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 a8f7fc1a1f18d49acbd430ef1e001fbf27deed05..d1c9f63f803c980324dfe9d44422699e7a005119 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 cdd1b4fd8c4450ffd2e40d7aba63063658cd1ead..7cf986c23ee6d339c19fc4fbef8f05a141657ca0 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
new file mode 100644 (file)
index 0000000..55860cd
Binary files /dev/null and b/dlls/postproc-51.dll differ

diff --git a/dlls/swresample-0.dll b/dlls/swresample-0.dll
new file mode 100644 (file)
index 0000000..0b43fed
Binary files /dev/null and b/dlls/swresample-0.dll differ

diff --git a/dlls/swscale-2.dll b/dlls/swscale-2.dll
index 38d5d3e2228bfc80e58f75223b69592432717669..6f9bfddde68d9c069898b87d91300bf7b1c6b7b6 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 0ce53ae02463bb47b33484620e47137f0fc2fa09..4a466545a801cf263d739eaa12fe7983ee267fb7 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 Fri Aug 26 23:40:03 2011\r
+/* at Wed Sep 21 22:02:53 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 60f49f0451b3344c48c777dff7f1d370ad267aa8..a31a6cd25bed4537f68ba0e6b70501701e335642 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 Fri Aug 26 23:40:03 2011\r
+/* at Wed Sep 21 22:02:53 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 1fcf62bc5a31e702cdaf974877d3ee92c14da94e..0b6b38d54ff1894becb962dc12c0edf6bfafdf03 100644 (file)
--- a/modules/ffmpeg/producer/filter/filter.cpp
+++ b/modules/ffmpeg/producer/filter/filter.cpp
@@ -22,7 +22,7 @@ extern "C"
        #include <libavfilter/avfilter.h>\r
        #include <libavfilter/avcodec.h>\r
        #include <libavfilter/avfiltergraph.h>\r
-       #include <libavfilter/vsink_buffer.h>\r
+       #include <libavfilter/buffersink.h>\r
        #include <libavfilter/vsrc_buffer.h>\r
 }\r
 #if defined(_MSC_VER)\r
@@ -88,7 +88,9 @@ struct filter::implementation
                        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
-                       THROW_ON_ERROR2(avfilter_graph_create_filter(&buffersink_ctx_, avfilter_get_by_name("buffersink"), "out", NULL, pix_fmts_.data(), graph_.get()), "[filter]");\r
+                       AVBufferSinkParams *buffersink_params = av_buffersink_params_alloc();\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, graph_.get()), "[filter]");\r
                        \r
                        AVFilterInOut* outputs = avfilter_inout_alloc();\r
                        AVFilterInOut* inputs  = avfilter_inout_alloc();\r
@@ -131,7 +133,7 @@ struct filter::implementation
                while (avfilter_poll_frame(buffersink_ctx_->inputs[0])) \r
                {\r
                        AVFilterBufferRef *picref;\r
-                       THROW_ON_ERROR2(av_vsink_buffer_get_video_buffer_ref(buffersink_ctx_, &picref, 0), "[filter]");\r
+                       THROW_ON_ERROR2(av_buffersink_get_buffer_ref(buffersink_ctx_, &picref, 0), "[filter]");\r
 \r
             if (picref) \r
                        {               \r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index ff5f37edd94b659d68b5c684cc92f88258b590a3..236741a0c35e54be25021ddd7fada8605def6758 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <configuration>\r
   <paths>\r
-    <media-path>C:\Lokala Filer\server\branches\2.0.0.2\bin\_media\</media-path>\r
+    <media-path>L:\casparcg\_media\</media-path>\r
     <log-path>L:\casparcg\_log\</log-path>\r
     <data-path>L:\casparcg\_data\</data-path>\r
     <template-path>L:\casparcg\_templates\</template-path>\r
@@ -33,7 +33,7 @@
     </producers>\r
     <channels>\r
       <channel>\r
-        <video-mode>PAL</video-mode>\r
+        <video-mode>1080p5000</video-mode>\r
         <consumers>\r
           <decklink>\r
             <device>1</device>\r

diff --git a/version.tmpl b/version.tmpl
index be6d4e933071ab5869b13849f2903d9544d4af6d..fb713a1ddf2facd657e4f3fb292aee84912fd35d 100644 (file)
--- a/version.tmpl
+++ b/version.tmpl
@@ -1,4 +1,5 @@
 #define CASPAR_GEN L"2"\r
 #define CASPAR_MAYOR L"0"\r
 #define CASPAR_MINOR L"2"\r
-#define CASPAR_REV L"$WCREV$"
\ No newline at end of file
+#define CASPAR_REV L"$WCREV$"\r
+#define CASPAR_TAG L"BETA 1"
\ No newline at end of file