2.0.0.2: Added new ffmpeg 0.7 dlls.

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

diff --git a/core/mixer/gpu/gpu_read_frame.cpp b/core/mixer/gpu/gpu_read_frame.cpp
deleted file mode 100644 (file)
index 65b1e21..0000000
--- a/core/mixer/gpu/gpu_read_frame.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
-*\r
-*  This file is part of CasparCG.\r
-*\r
-*    CasparCG is free software: you can redistribute it and/or modify\r
-*    it under the terms of the GNU General Public License as published by\r
-*    the Free Software Foundation, either version 3 of the License, or\r
-*    (at your option) any later version.\r
-*\r
-*    CasparCG is distributed in the hope that it will be useful,\r
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-*    GNU General Public License for more details.\r
-\r
-*    You should have received a copy of the GNU General Public License\r
-*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-*/\r
-#include "../../stdafx.h"\r
-\r
-#include "gpu_read_frame.h"\r
-\r
-#include "../gpu/host_buffer.h"\r
-\r
-#include <common/gl/gl_check.h>\r
-\r
-namespace caspar { namespace mixer {\r
-                                                                                                                                                                                                                                                                                                                       \r
-struct gpu_read_frame::implementation : boost::noncopyable\r
-{\r
-       safe_ptr<const host_buffer> image_data_;\r
-       std::vector<short> audio_data_;\r
-\r
-public:\r
-       implementation(safe_ptr<const host_buffer>&& image_data, std::vector<short>&& audio_data) \r
-               : image_data_(std::move(image_data))\r
-               , audio_data_(std::move(audio_data)){}  \r
-};\r
-\r
-gpu_read_frame::gpu_read_frame(safe_ptr<const host_buffer>&& image_data, std::vector<short>&& audio_data) : impl_(new implementation(std::move(image_data), std::move(audio_data))){}\r
-\r
-const boost::iterator_range<const unsigned char*> gpu_read_frame::image_data() const\r
-{\r
-       if(!impl_->image_data_->data())\r
-               return boost::iterator_range<const unsigned char*>();\r
-       auto ptr = static_cast<const unsigned char*>(impl_->image_data_->data());\r
-       return boost::iterator_range<const unsigned char*>(ptr, ptr + impl_->image_data_->size());\r
-}\r
-const boost::iterator_range<const short*> gpu_read_frame::audio_data() const\r
-{\r
-       return boost::iterator_range<const short*>(impl_->audio_data_.data(), impl_->audio_data_.data() + impl_->audio_data_.size());\r
-}\r
-\r
-}}
\ No newline at end of file

diff --git a/core/mixer/gpu/gpu_read_frame.h b/core/mixer/gpu/gpu_read_frame.h
deleted file mode 100644 (file)
index 4f84ecd..0000000
--- a/core/mixer/gpu/gpu_read_frame.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
-*\r
-*  This file is part of CasparCG.\r
-*\r
-*    CasparCG is free software: you can redistribute it and/or modify\r
-*    it under the terms of the GNU General Public License as published by\r
-*    the Free Software Foundation, either version 3 of the License, or\r
-*    (at your option) any later version.\r
-*\r
-*    CasparCG is distributed in the hope that it will be useful,\r
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-*    GNU General Public License for more details.\r
-\r
-*    You should have received a copy of the GNU General Public License\r
-*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-*/\r
-#pragma once\r
-\r
-#include "../gpu/host_buffer.h"        \r
-\r
-#include <core/consumer/frame/read_frame.h>\r
-\r
-#include <boost/noncopyable.hpp>\r
-#include <boost/range/iterator_range.hpp>\r
-\r
-#include <memory>\r
-#include <vector>\r
-\r
-#include <common/memory/safe_ptr.h>\r
-\r
-namespace caspar { namespace mixer {\r
-       \r
-class gpu_read_frame : public core::read_frame\r
-{\r
-public:\r
-       gpu_read_frame(safe_ptr<const host_buffer>&& image_data, std::vector<short>&& audio_data);\r
-\r
-       const boost::iterator_range<const unsigned char*> image_data() const;\r
-       const boost::iterator_range<const short*> audio_data() const;\r
-       \r
-private:\r
-       struct implementation;\r
-       std::shared_ptr<implementation> impl_;\r
-};\r
-\r
-}}
\ No newline at end of file

diff --git a/core/mixer/gpu/gpu_write_frame.cpp b/core/mixer/gpu/gpu_write_frame.cpp
deleted file mode 100644 (file)
index f7fd000..0000000
--- a/core/mixer/gpu/gpu_write_frame.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
-*\r
-*  This file is part of CasparCG.\r
-*\r
-*    CasparCG is free software: you can redistribute it and/or modify\r
-*    it under the terms of the GNU General Public License as published by\r
-*    the Free Software Foundation, either version 3 of the License, or\r
-*    (at your option) any later version.\r
-*\r
-*    CasparCG is distributed in the hope that it will be useful,\r
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-*    GNU General Public License for more details.\r
-\r
-*    You should have received a copy of the GNU General Public License\r
-*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-*/\r
-#include "../../stdafx.h"\r
-\r
-#include "gpu_write_frame.h"\r
-\r
-#include <core/producer/frame/pixel_format.h>\r
-\r
-#include "../image/image_mixer.h"\r
-#include "../audio/audio_mixer.h"\r
-\r
-#include "../gpu/host_buffer.h"\r
-\r
-#include <common/gl/gl_check.h>\r
-\r
-#include <boost/range/algorithm.hpp>\r
-\r
-namespace caspar { namespace mixer {\r
-                                                                                                                                                                                                                                                                                                                       \r
-struct gpu_write_frame::implementation : boost::noncopyable\r
-{                              \r
-       std::vector<safe_ptr<host_buffer>> buffers_;\r
-       std::vector<short> audio_data_;\r
-       const core::pixel_format_desc desc_;\r
-       int tag_;\r
-\r
-public:\r
-       implementation(int tag, const core::pixel_format_desc& desc, const std::vector<safe_ptr<host_buffer>>& buffers) \r
-               : desc_(desc)\r
-               , buffers_(buffers)\r
-               , tag_(tag){}\r
-       \r
-       void accept(gpu_write_frame& self, core::frame_visitor& visitor)\r
-       {\r
-               visitor.begin(self);\r
-               visitor.visit(self);\r
-               visitor.end();\r
-       }\r
-\r
-       boost::iterator_range<unsigned char*> image_data(size_t index)\r
-       {\r
-               if(index >= buffers_.size() || !buffers_[index]->data())\r
-                       return boost::iterator_range<const unsigned char*>();\r
-               auto ptr = static_cast<unsigned char*>(buffers_[index]->data());\r
-               return boost::iterator_range<unsigned char*>(ptr, ptr+buffers_[index]->size());\r
-       }\r
-\r
-       const boost::iterator_range<const unsigned char*> image_data(size_t index) const\r
-       {\r
-               if(index >= buffers_.size() || !buffers_[index]->data())\r
-                       return boost::iterator_range<const unsigned char*>();\r
-               auto ptr = static_cast<const unsigned char*>(buffers_[index]->data());\r
-               return boost::iterator_range<const unsigned char*>(ptr, ptr+buffers_[index]->size());\r
-       }\r
-};\r
-       \r
-gpu_write_frame::gpu_write_frame(int tag, const core::pixel_format_desc& desc, const std::vector<safe_ptr<host_buffer>>& buffers) : impl_(new implementation(tag, desc, buffers)){}\r
-void gpu_write_frame::accept(core::frame_visitor& visitor){impl_->accept(*this, visitor);}\r
-\r
-boost::iterator_range<unsigned char*> gpu_write_frame::image_data(size_t index){return impl_->image_data(index);}\r
-std::vector<short>& gpu_write_frame::audio_data() { return impl_->audio_data_; }\r
-const boost::iterator_range<const unsigned char*> gpu_write_frame::image_data(size_t index) const\r
-{\r
-       return boost::iterator_range<const unsigned char*>(impl_->image_data(index).begin(), impl_->image_data(index).end());\r
-}\r
-const boost::iterator_range<const short*> gpu_write_frame::audio_data() const\r
-{\r
-       return boost::iterator_range<const short*>(impl_->audio_data_.data(), impl_->audio_data_.data() + impl_->audio_data_.size());\r
-}\r
-int gpu_write_frame::tag() const {return impl_->tag_;}\r
-const core::pixel_format_desc& gpu_write_frame::get_pixel_format_desc() const{return impl_->desc_;}\r
-std::vector<safe_ptr<host_buffer>>& gpu_write_frame::get_plane_buffers(){return impl_->buffers_;}\r
-}}
\ No newline at end of file

diff --git a/core/mixer/gpu/gpu_write_frame.h b/core/mixer/gpu/gpu_write_frame.h
deleted file mode 100644 (file)
index 93399f1..0000000
--- a/core/mixer/gpu/gpu_write_frame.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
-*\r
-*  This file is part of CasparCG.\r
-*\r
-*    CasparCG is free software: you can redistribute it and/or modify\r
-*    it under the terms of the GNU General Public License as published by\r
-*    the Free Software Foundation, either version 3 of the License, or\r
-*    (at your option) any later version.\r
-*\r
-*    CasparCG is distributed in the hope that it will be useful,\r
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-*    GNU General Public License for more details.\r
-\r
-*    You should have received a copy of the GNU General Public License\r
-*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-*/\r
-#pragma once\r
-\r
-#include <common/memory/safe_ptr.h>\r
-#include <core/producer/frame/write_frame.h>\r
-#include <core/producer/frame/pixel_format.h>\r
-\r
-#include "../gpu/host_buffer.h"\r
-\r
-#include <boost/noncopyable.hpp>\r
-#include <boost/range/iterator_range.hpp>\r
-\r
-#include <memory>\r
-#include <vector>\r
-\r
-namespace caspar { namespace mixer {\r
-       \r
-class gpu_write_frame : public core::write_frame\r
-{\r
-public:        \r
-       explicit gpu_write_frame(int tag, const core::pixel_format_desc& desc, const std::vector<safe_ptr<host_buffer>>& buffers);\r
-\r
-       const core::pixel_format_desc& get_pixel_format_desc() const;\r
-       std::vector<safe_ptr<host_buffer>>& get_plane_buffers();\r
-               \r
-       // core::write_frame\r
-       virtual boost::iterator_range<unsigned char*> image_data(size_t plane_index = 0);       \r
-       virtual std::vector<short>& audio_data();\r
-       \r
-       virtual const boost::iterator_range<const unsigned char*> image_data(size_t plane_index = 0) const;\r
-       virtual const boost::iterator_range<const short*> audio_data() const;\r
-\r
-       virtual void accept(core::frame_visitor& visitor);\r
-\r
-       virtual int tag() const;\r
-       \r
-private:\r
-       struct implementation;\r
-       std::shared_ptr<implementation> impl_;\r
-};\r
-typedef std::shared_ptr<gpu_write_frame> gpu_write_frame_impl_ptr;\r
-\r
-\r
-}}
\ No newline at end of file

diff --git a/core/producer/frame/write_frame.h b/core/producer/frame/write_frame.h
deleted file mode 100644 (file)
index 8b18c6f..0000000
--- a/core/producer/frame/write_frame.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
-*\r
-*  This file is part of CasparCG.\r
-*\r
-*    CasparCG is free software: you can redistribute it and/or modify\r
-*    it under the terms of the GNU General Public License as published by\r
-*    the Free Software Foundation, either version 3 of the License, or\r
-*    (at your option) any later version.\r
-*\r
-*    CasparCG is distributed in the hope that it will be useful,\r
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-*    GNU General Public License for more details.\r
-\r
-*    You should have received a copy of the GNU General Public License\r
-*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-*/\r
-#pragma once\r
-\r
-#include "basic_frame.h"\r
-\r
-#include "../../video_format.h"\r
-\r
-#include <boost/noncopyable.hpp>\r
-#include <boost/range/iterator_range.hpp>\r
-\r
-#include <memory>\r
-#include <vector>\r
-\r
-namespace caspar { namespace core {\r
-       \r
-class write_frame : public basic_frame, boost::noncopyable\r
-{\r
-public:                        \r
-       virtual boost::iterator_range<unsigned char*> image_data(size_t plane_index = 0) = 0;\r
-       virtual std::vector<short>& audio_data() = 0;\r
-       \r
-       virtual const boost::iterator_range<const unsigned char*> image_data(size_t plane_index = 0) const = 0;\r
-       virtual const boost::iterator_range<const short*> audio_data() const = 0;\r
-\r
-       virtual void accept(frame_visitor& visitor) = 0;\r
-\r
-       virtual int tag() const = 0; // Tag which identifies current video-stream.\r
-};\r
-\r
-}}
\ No newline at end of file

diff --git a/dlls/avcodec-52.dll b/dlls/avcodec-53.dll
similarity index 60%
rename from dlls/avcodec-52.dll
rename to dlls/avcodec-53.dll
index 6cda466a6988dab4cc3e456e65cd693c08622bd9..fce76bb017eb2002ed3e9853207d80d5f4ea5e67 100644 (file)
Binary files a/dlls/avcodec-52.dll and b/dlls/avcodec-53.dll differ

diff --git a/dlls/avcore-0.dll b/dlls/avcore-0.dll
deleted file mode 100644 (file)
index be04b90..0000000
Binary files a/dlls/avcore-0.dll and /dev/null differ

diff --git a/dlls/avdevice-52.dll b/dlls/avdevice-52.dll
deleted file mode 100644 (file)
index 6c99478..0000000
Binary files a/dlls/avdevice-52.dll and /dev/null differ

diff --git a/dlls/avfilter-2.dll b/dlls/avfilter-2.dll
new file mode 100644 (file)
index 0000000..b562539
Binary files /dev/null and b/dlls/avfilter-2.dll differ

diff --git a/dlls/avformat-52.dll b/dlls/avformat-52.dll
deleted file mode 100644 (file)
index bbff2a8..0000000
Binary files a/dlls/avformat-52.dll and /dev/null differ

diff --git a/dlls/avformat-53.dll b/dlls/avformat-53.dll
new file mode 100644 (file)
index 0000000..3984c91
Binary files /dev/null and b/dlls/avformat-53.dll differ

diff --git a/dlls/avutil-50.dll b/dlls/avutil-50.dll
deleted file mode 100644 (file)
index 37111cb..0000000
Binary files a/dlls/avutil-50.dll and /dev/null differ

diff --git a/dlls/avutil-51.dll b/dlls/avutil-51.dll
new file mode 100644 (file)
index 0000000..3c46839
Binary files /dev/null and b/dlls/avutil-51.dll differ

diff --git a/dlls/postproc-51.dll b/dlls/postproc-51.dll
deleted file mode 100644 (file)
index f609005..0000000
Binary files a/dlls/postproc-51.dll and /dev/null differ

diff --git a/dlls/swscale-0.dll b/dlls/swscale-0.dll
index 6c281863b7da78595e0cf736956bd8780a665612..d2cc474104d3251ee23c0ba5dae6b60f952892f7 100644 (file)
Binary files a/dlls/swscale-0.dll and b/dlls/swscale-0.dll differ