From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Wed, 21 Sep 2011 21:29:59 +0000 (+0000)
Subject: 2.0.0.2: Updated ffmpeg.
X-Git-Tag: 2.0.1~3
X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=ca4193194e570781a824519791fa7cbdee032946

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 6d2bd040c..59a01c7d0 100644
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
index 000000000..cadd1b0e8
Binary files /dev/null and b/dlls/avdevice-53.dll differ
diff --git a/dlls/avfilter-2.dll b/dlls/avfilter-2.dll
index eb327d821..24f5f2c5b 100644
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 a8f7fc1a1..d1c9f63f8 100644
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 cdd1b4fd8..7cf986c23 100644
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
index 000000000..55860cdd4
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
index 000000000..0b43fede0
Binary files /dev/null and b/dlls/swresample-0.dll differ
diff --git a/dlls/swscale-2.dll b/dlls/swscale-2.dll
index 38d5d3e22..6f9bfddde 100644
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 0ce53ae02..4a466545a 100644
--- a/modules/decklink/interop/DeckLinkAPI_h.h
+++ b/modules/decklink/interop/DeckLinkAPI_h.h
@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 7.00.0555 */
-/* at Fri Aug 26 23:40:03 2011
+/* at Wed Sep 21 22:02:53 2011
  */
 /* Compiler settings for interop\DeckLinkAPI.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 
diff --git a/modules/decklink/interop/DeckLinkAPI_i.c b/modules/decklink/interop/DeckLinkAPI_i.c
index 60f49f045..a31a6cd25 100644
--- a/modules/decklink/interop/DeckLinkAPI_i.c
+++ b/modules/decklink/interop/DeckLinkAPI_i.c
@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 7.00.0555 */
-/* at Fri Aug 26 23:40:03 2011
+/* at Wed Sep 21 22:02:53 2011
  */
 /* Compiler settings for interop\DeckLinkAPI.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 
diff --git a/modules/ffmpeg/producer/filter/filter.cpp b/modules/ffmpeg/producer/filter/filter.cpp
index 1fcf62bc5..0b6b38d54 100644
--- a/modules/ffmpeg/producer/filter/filter.cpp
+++ b/modules/ffmpeg/producer/filter/filter.cpp
@@ -22,7 +22,7 @@ extern "C"
 	#include <libavfilter/avfilter.h>
 	#include <libavfilter/avcodec.h>
 	#include <libavfilter/avfiltergraph.h>
-	#include <libavfilter/vsink_buffer.h>
+	#include <libavfilter/buffersink.h>
 	#include <libavfilter/vsrc_buffer.h>
 }
 #if defined(_MSC_VER)
@@ -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]");
 
 			// OPIX_FMT_BGRAutput
-			THROW_ON_ERROR2(avfilter_graph_create_filter(&buffersink_ctx_, avfilter_get_by_name("buffersink"), "out", NULL, pix_fmts_.data(), graph_.get()), "[filter]");
+			AVBufferSinkParams *buffersink_params = av_buffersink_params_alloc();
+			buffersink_params->pixel_fmts = pix_fmts_.data();
+			THROW_ON_ERROR2(avfilter_graph_create_filter(&buffersink_ctx_, avfilter_get_by_name("buffersink"), "out", NULL, buffersink_params, graph_.get()), "[filter]");
 			
 			AVFilterInOut* outputs = avfilter_inout_alloc();
 			AVFilterInOut* inputs  = avfilter_inout_alloc();
@@ -131,7 +133,7 @@ struct filter::implementation
 		while (avfilter_poll_frame(buffersink_ctx_->inputs[0])) 
 		{
 			AVFilterBufferRef *picref;
-			THROW_ON_ERROR2(av_vsink_buffer_get_video_buffer_ref(buffersink_ctx_, &picref, 0), "[filter]");
+			THROW_ON_ERROR2(av_buffersink_get_buffer_ref(buffersink_ctx_, &picref, 0), "[filter]");
 
             if (picref) 
 			{		
diff --git a/shell/casparcg.config b/shell/casparcg.config
index ff5f37edd..236741a0c 100644
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <paths>
-    <media-path>C:\Lokala Filer\server\branches\2.0.0.2\bin\_media\</media-path>
+    <media-path>L:\casparcg\_media\</media-path>
     <log-path>L:\casparcg\_log\</log-path>
     <data-path>L:\casparcg\_data\</data-path>
     <template-path>L:\casparcg\_templates\</template-path>
@@ -33,7 +33,7 @@
     </producers>
     <channels>
       <channel>
-        <video-mode>PAL</video-mode>
+        <video-mode>1080p5000</video-mode>
         <consumers>
           <decklink>
             <device>1</device>
diff --git a/version.tmpl b/version.tmpl
index be6d4e933..fb713a1dd 100644
--- a/version.tmpl
+++ b/version.tmpl
@@ -1,4 +1,5 @@
 #define CASPAR_GEN L"2"
 #define CASPAR_MAYOR L"0"
 #define CASPAR_MINOR L"2"
-#define CASPAR_REV L"$WCREV$"
\ No newline at end of file
+#define CASPAR_REV L"$WCREV$"
+#define CASPAR_TAG L"BETA 1"
\ No newline at end of file