2.1.0: Updated ffmpeg version.

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

diff --git a/dependencies64/dependencies64.exe b/dependencies64/dependencies64.exe
index edf6145182730948d4bc848f68c5a2f92f6a2828..9cb4484c507aa154073d2b0a7101166ae72134ba 100644 (file)
Binary files a/dependencies64/dependencies64.exe and b/dependencies64/dependencies64.exe differ

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
index a329863a2147cdc88284acc6a210ca2d51cf4976..e48266cf35ed94ba2c3da741882f2b4008bbcf81 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -61,6 +61,7 @@ extern "C"
        #include <libavutil/opt.h>\r
        #include <libavutil/pixdesc.h>\r
        #include <libavutil/parseutils.h>\r
+       #include <libavutil/samplefmt.h>\r
 }\r
 #if defined(_MSC_VER)\r
 #pragma warning (pop)\r
@@ -280,8 +281,6 @@ public:
 \r
                oc_->oformat = output_format_.format;\r
                                \r
-               THROW_ON_ERROR2(av_set_parameters(oc_.get(), nullptr), "[ffmpeg_consumer]");\r
-\r
                strcpy_s(oc_->filename, filename_.c_str());\r
                \r
                //  Add the audio and video streams using the default format codecs     and initialize the codecs.\r
@@ -289,13 +288,13 @@ public:
                video_st_ = add_video_stream(options2);\r
                audio_st_ = add_audio_stream(options);\r
                                \r
-               dump_format(oc_.get(), 0, filename_.c_str(), 1);\r
+               av_dump_format(oc_.get(), 0, filename_.c_str(), 1);\r
                 \r
                // Open the output ffmpeg, if needed.\r
                if (!(oc_->oformat->flags & AVFMT_NOFILE)) \r
-                       THROW_ON_ERROR2(avio_open(&oc_->pb, filename_.c_str(), URL_WRONLY), "[ffmpeg_consumer]");\r
+                       THROW_ON_ERROR2(avio_open(&oc_->pb, filename.c_str(), AVIO_FLAG_WRITE), "[ffmpeg_consumer]");\r
                                \r
-               THROW_ON_ERROR2(av_write_header(oc_.get()), "[ffmpeg_consumer]");\r
+               THROW_ON_ERROR2(avformat_write_header(oc_.get(), nullptr), "[ffmpeg_consumer]");\r
 \r
                if(options.size() > 0)\r
                {\r
@@ -445,7 +444,7 @@ public:
                c->codec_type           = AVMEDIA_TYPE_AUDIO;\r
                c->sample_rate          = 48000;\r
                c->channels                     = 2;\r
-               c->sample_fmt           = SAMPLE_FMT_S16;\r
+               c->sample_fmt           = AV_SAMPLE_FMT_S16;\r
 \r
                if(output_format_.vcodec == CODEC_ID_FLV1)              \r
                        c->sample_rate  = 44100;                \r

diff --git a/modules/ffmpeg/ffmpeg.cpp b/modules/ffmpeg/ffmpeg.cpp
index 18c1a7df7f422b514d660387cb9c73291d3b19bd..48ee8b20bb76c051db45b1bf6758ed8f9afb1a8a 100644 (file)
--- a/modules/ffmpeg/ffmpeg.cpp
+++ b/modules/ffmpeg/ffmpeg.cpp
@@ -204,7 +204,6 @@ void init()
        //fix_yadif_filter_format_query();\r
        av_register_all();\r
     avformat_network_init();\r
-       avcodec_init();\r
     avcodec_register_all();\r
        \r
        core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_consumer(params);});\r