media-libs/opencv: remove old 2.4.9 and 2.4.10

Package-Manager: portage-2.2.26

5 files changed, 0 insertions, 1002 deletions

diff --git a/media-libs/opencv/files/opencv-2.4.10-git-autodetect.patch b/media-libs/opencv/files/opencv-2.4.10-git-autodetect.patch
deleted file mode 100644
index 934986441ee6..000000000000
--- a/media-libs/opencv/files/opencv-2.4.10-git-autodetect.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- opencv-2.4.10/work/opencv-2.4.10/CMakeLists.txt.old	2016-04-07 14:17:10.524981054 +0200
-+++ opencv-2.4.10/work/opencv-2.4.10/CMakeLists.txt	2016-04-07 14:13:38.726989961 +0200
-@@ -375,32 +375,32 @@
- # ----------------------------------------------------------------------------
- 
- # don't use FindGit because it requires CMake 2.8.2
--set(git_names git eg) # eg = easy git
-+#set(git_names git eg) # eg = easy git
- # Prefer .cmd variants on Windows unless running in a Makefile in the MSYS shell
--if(CMAKE_HOST_WIN32)
--  if(NOT CMAKE_GENERATOR MATCHES "MSYS")
--    set(git_names git.cmd git eg.cmd eg)
--  endif()
--endif()
-+#if(CMAKE_HOST_WIN32)
-+#  if(NOT CMAKE_GENERATOR MATCHES "MSYS")
-+#    set(git_names git.cmd git eg.cmd eg)
-+#  endif()
-+#endif()
- 
--find_host_program(GIT_EXECUTABLE NAMES ${git_names} PATH_SUFFIXES Git/cmd Git/bin DOC "git command line client")
--mark_as_advanced(GIT_EXECUTABLE)
-+#find_host_program(GIT_EXECUTABLE NAMES ${git_names} PATH_SUFFIXES Git/cmd Git/bin DOC "git command line client")
-+#mark_as_advanced(GIT_EXECUTABLE)
- 
--if(GIT_EXECUTABLE)
--  execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty --match "2.[0-9].[0-9]*"
--    WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
--    OUTPUT_VARIABLE OPENCV_VCSVERSION
--    RESULT_VARIABLE GIT_RESULT
--    ERROR_QUIET
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  if(NOT GIT_RESULT EQUAL 0)
--    set(OPENCV_VCSVERSION "unknown")
--  endif()
--else()
-+#if(GIT_EXECUTABLE)
-+#  execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty --match "2.[0-9].[0-9]*"
-+#    WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
-+#    OUTPUT_VARIABLE OPENCV_VCSVERSION
-+#    RESULT_VARIABLE GIT_RESULT
-+#    ERROR_QUIET
-+#    OUTPUT_STRIP_TRAILING_WHITESPACE
-+#  )
-+#  if(NOT GIT_RESULT EQUAL 0)
-+#    set(OPENCV_VCSVERSION "unknown")
-+#  endif()
-+#else()
-   # We don't have git:
--  set(OPENCV_VCSVERSION "unknown")
--endif()
-+#  set(OPENCV_VCSVERSION "unknown")
-+#endif()
- 
- 
- # ----------------------------------------------------------------------------
diff --git a/media-libs/opencv/files/opencv-2.4.10-pic-x86.patch b/media-libs/opencv/files/opencv-2.4.10-pic-x86.patch
deleted file mode 100644
index 74b75016183b..000000000000
--- a/media-libs/opencv/files/opencv-2.4.10-pic-x86.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From ea50be0529c248961e1b66293f8a9e4b807294a6 Mon Sep 17 00:00:00 2001
-From: Samuel Martin <s.martin49@gmail.com>
-Date: Sun, 12 Oct 2014 10:17:23 +0200
-Subject: [PATCH] core: fix x86 PIC code compilation
-
-This bug was triggered by Buildroot autobuilders [1,2], causing this
-kind of failures [3,4]:
-
-  [ 14%] Building CXX object modules/core/CMakeFiles/opencv_core.dir/src/system.cpp.o
-  /home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp: In function '(static initializers for /home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp)':
-  /home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp:280:10: error: inconsistent operand constraints in an 'asm'
-  make[3]: *** [modules/core/CMakeFiles/opencv_core.dir/src/system.cpp.o] Error 1
-
-[1] http://buildroot.org/
-[2] http://autobuild.buildroot.org/
-[3] http://autobuild.buildroot.org/?reason=opencv-2.4.10
-[4] http://autobuild.buildroot.org/results/483/4838285b25d6293a5cf0bb9eadd5040a7c75d766/build-end.log
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
----
- modules/core/src/system.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
-index 5a970d5..e9ffdc7 100644
---- a/modules/core/src/system.cpp
-+++ b/modules/core/src/system.cpp
-@@ -267,14 +267,17 @@ struct HWFeatures
-          : "cc"
-         );
-         #else
-+        // We need to preserve ebx since we are compiling PIC code.
-+        // This means we cannot use "=b" for the 2nd output register.
-         asm volatile
-         (
-          "pushl %%ebx\n\t"
-          "movl $7,%%eax\n\t"
-          "movl $0,%%ecx\n\t"
-          "cpuid\n\t"
-+         "movl %%ebx,%1\n\t"
-          "popl %%ebx\n\t"
--         : "=a"(cpuid_data[0]), "=b"(cpuid_data[1]), "=c"(cpuid_data[2]), "=d"(cpuid_data[3])
-+         : "=a"(cpuid_data[0]), "=r"(cpuid_data[1]), "=c"(cpuid_data[2]), "=d"(cpuid_data[3])
-          :
-          : "cc"
-         );
--- 
-2.4.1
-
diff --git a/media-libs/opencv/files/opencv-2.4.9-cuda.patch b/media-libs/opencv/files/opencv-2.4.9-cuda.patch
deleted file mode 100644
index 2cb84160022b..000000000000
--- a/media-libs/opencv/files/opencv-2.4.9-cuda.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-commit feb74b125d7923c0bc11054b66863e1e9f753141
-Author: Alexander Smorkalov <alexander.smorkalov@itseez.com>
-Date:   Mon Jul 14 14:26:50 2014 +0400
-
-    Build fixes for CUDA 6.5
-    (cherry picked from commit 60a5ada4541e777bd2ad3fe0322180706351e58b)
-
-diff --git a/modules/gpu/src/nvidia/core/NCVPixelOperations.hpp b/modules/gpu/src/nvidia/core/NCVPixelOperations.hpp
-index c1e06b4..1c95414 100644
---- a/modules/gpu/src/nvidia/core/NCVPixelOperations.hpp
-+++ b/modules/gpu/src/nvidia/core/NCVPixelOperations.hpp
-@@ -48,24 +48,24 @@
- #include "NCV.hpp"
- 
- template<typename TBase> inline __host__ __device__ TBase _pixMaxVal();
--template<> static inline __host__ __device__ Ncv8u  _pixMaxVal<Ncv8u>()  {return UCHAR_MAX;}
--template<> static inline __host__ __device__ Ncv16u _pixMaxVal<Ncv16u>() {return USHRT_MAX;}
--template<> static inline __host__ __device__ Ncv32u _pixMaxVal<Ncv32u>() {return  UINT_MAX;}
--template<> static inline __host__ __device__ Ncv8s  _pixMaxVal<Ncv8s>()  {return  SCHAR_MAX;}
--template<> static inline __host__ __device__ Ncv16s _pixMaxVal<Ncv16s>() {return  SHRT_MAX;}
--template<> static inline __host__ __device__ Ncv32s _pixMaxVal<Ncv32s>() {return   INT_MAX;}
--template<> static inline __host__ __device__ Ncv32f _pixMaxVal<Ncv32f>() {return   FLT_MAX;}
--template<> static inline __host__ __device__ Ncv64f _pixMaxVal<Ncv64f>() {return   DBL_MAX;}
-+template<>  inline __host__ __device__ Ncv8u  _pixMaxVal<Ncv8u>()  {return UCHAR_MAX;}
-+template<>  inline __host__ __device__ Ncv16u _pixMaxVal<Ncv16u>() {return USHRT_MAX;}
-+template<>  inline __host__ __device__ Ncv32u _pixMaxVal<Ncv32u>() {return  UINT_MAX;}
-+template<>  inline __host__ __device__ Ncv8s  _pixMaxVal<Ncv8s>()  {return  SCHAR_MAX;}
-+template<>  inline __host__ __device__ Ncv16s _pixMaxVal<Ncv16s>() {return  SHRT_MAX;}
-+template<>  inline __host__ __device__ Ncv32s _pixMaxVal<Ncv32s>() {return   INT_MAX;}
-+template<>  inline __host__ __device__ Ncv32f _pixMaxVal<Ncv32f>() {return   FLT_MAX;}
-+template<>  inline __host__ __device__ Ncv64f _pixMaxVal<Ncv64f>() {return   DBL_MAX;}
- 
- template<typename TBase> inline __host__ __device__ TBase _pixMinVal();
--template<> static inline __host__ __device__ Ncv8u  _pixMinVal<Ncv8u>()  {return 0;}
--template<> static inline __host__ __device__ Ncv16u _pixMinVal<Ncv16u>() {return 0;}
--template<> static inline __host__ __device__ Ncv32u _pixMinVal<Ncv32u>() {return 0;}
--template<> static inline __host__ __device__ Ncv8s  _pixMinVal<Ncv8s>()  {return SCHAR_MIN;}
--template<> static inline __host__ __device__ Ncv16s _pixMinVal<Ncv16s>() {return SHRT_MIN;}
--template<> static inline __host__ __device__ Ncv32s _pixMinVal<Ncv32s>() {return INT_MIN;}
--template<> static inline __host__ __device__ Ncv32f _pixMinVal<Ncv32f>() {return FLT_MIN;}
--template<> static inline __host__ __device__ Ncv64f _pixMinVal<Ncv64f>() {return DBL_MIN;}
-+template<>  inline __host__ __device__ Ncv8u  _pixMinVal<Ncv8u>()  {return 0;}
-+template<>  inline __host__ __device__ Ncv16u _pixMinVal<Ncv16u>() {return 0;}
-+template<>  inline __host__ __device__ Ncv32u _pixMinVal<Ncv32u>() {return 0;}
-+template<>  inline __host__ __device__ Ncv8s  _pixMinVal<Ncv8s>()  {return SCHAR_MIN;}
-+template<>  inline __host__ __device__ Ncv16s _pixMinVal<Ncv16s>() {return SHRT_MIN;}
-+template<>  inline __host__ __device__ Ncv32s _pixMinVal<Ncv32s>() {return INT_MIN;}
-+template<>  inline __host__ __device__ Ncv32f _pixMinVal<Ncv32f>() {return FLT_MIN;}
-+template<>  inline __host__ __device__ Ncv64f _pixMinVal<Ncv64f>() {return DBL_MIN;}
- 
- template<typename Tvec> struct TConvVec2Base;
- template<> struct TConvVec2Base<uchar1>  {typedef Ncv8u TBase;};
-@@ -116,21 +116,21 @@ template<typename Tin> static inline __host__ __device__ void _TDemoteClampNN(Ti
- template<typename Tin> static inline __host__ __device__ void _TDemoteClampNN(Tin &a, Ncv32f &out) {out = (Ncv32f)a;}
- 
- template<typename Tout> inline Tout _pixMakeZero();
--template<> static inline __host__ __device__ uchar1 _pixMakeZero<uchar1>() {return make_uchar1(0);}
--template<> static inline __host__ __device__ uchar3 _pixMakeZero<uchar3>() {return make_uchar3(0,0,0);}
--template<> static inline __host__ __device__ uchar4 _pixMakeZero<uchar4>() {return make_uchar4(0,0,0,0);}
--template<> static inline __host__ __device__ ushort1 _pixMakeZero<ushort1>() {return make_ushort1(0);}
--template<> static inline __host__ __device__ ushort3 _pixMakeZero<ushort3>() {return make_ushort3(0,0,0);}
--template<> static inline __host__ __device__ ushort4 _pixMakeZero<ushort4>() {return make_ushort4(0,0,0,0);}
--template<> static inline __host__ __device__ uint1 _pixMakeZero<uint1>() {return make_uint1(0);}
--template<> static inline __host__ __device__ uint3 _pixMakeZero<uint3>() {return make_uint3(0,0,0);}
--template<> static inline __host__ __device__ uint4 _pixMakeZero<uint4>() {return make_uint4(0,0,0,0);}
--template<> static inline __host__ __device__ float1 _pixMakeZero<float1>() {return make_float1(0.f);}
--template<> static inline __host__ __device__ float3 _pixMakeZero<float3>() {return make_float3(0.f,0.f,0.f);}
--template<> static inline __host__ __device__ float4 _pixMakeZero<float4>() {return make_float4(0.f,0.f,0.f,0.f);}
--template<> static inline __host__ __device__ double1 _pixMakeZero<double1>() {return make_double1(0.);}
--template<> static inline __host__ __device__ double3 _pixMakeZero<double3>() {return make_double3(0.,0.,0.);}
--template<> static inline __host__ __device__ double4 _pixMakeZero<double4>() {return make_double4(0.,0.,0.,0.);}
-+template<>  inline __host__ __device__ uchar1 _pixMakeZero<uchar1>() {return make_uchar1(0);}
-+template<>  inline __host__ __device__ uchar3 _pixMakeZero<uchar3>() {return make_uchar3(0,0,0);}
-+template<>  inline __host__ __device__ uchar4 _pixMakeZero<uchar4>() {return make_uchar4(0,0,0,0);}
-+template<>  inline __host__ __device__ ushort1 _pixMakeZero<ushort1>() {return make_ushort1(0);}
-+template<>  inline __host__ __device__ ushort3 _pixMakeZero<ushort3>() {return make_ushort3(0,0,0);}
-+template<>  inline __host__ __device__ ushort4 _pixMakeZero<ushort4>() {return make_ushort4(0,0,0,0);}
-+template<>  inline __host__ __device__ uint1 _pixMakeZero<uint1>() {return make_uint1(0);}
-+template<>  inline __host__ __device__ uint3 _pixMakeZero<uint3>() {return make_uint3(0,0,0);}
-+template<>  inline __host__ __device__ uint4 _pixMakeZero<uint4>() {return make_uint4(0,0,0,0);}
-+template<>  inline __host__ __device__ float1 _pixMakeZero<float1>() {return make_float1(0.f);}
-+template<>  inline __host__ __device__ float3 _pixMakeZero<float3>() {return make_float3(0.f,0.f,0.f);}
-+template<>  inline __host__ __device__ float4 _pixMakeZero<float4>() {return make_float4(0.f,0.f,0.f,0.f);}
-+template<>  inline __host__ __device__ double1 _pixMakeZero<double1>() {return make_double1(0.);}
-+template<>  inline __host__ __device__ double3 _pixMakeZero<double3>() {return make_double3(0.,0.,0.);}
-+template<>  inline __host__ __device__ double4 _pixMakeZero<double4>() {return make_double4(0.,0.,0.,0.);}
- 
- static inline __host__ __device__ uchar1 _pixMake(Ncv8u x) {return make_uchar1(x);}
- static inline __host__ __device__ uchar3 _pixMake(Ncv8u x, Ncv8u y, Ncv8u z) {return make_uchar3(x,y,z);}
diff --git a/media-libs/opencv/files/opencv-2.4.9-git-autodetect.patch b/media-libs/opencv/files/opencv-2.4.9-git-autodetect.patch
deleted file mode 100644
index 7c458579c1e7..000000000000
--- a/media-libs/opencv/files/opencv-2.4.9-git-autodetect.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- CMakeLists.txt.old	2016-04-07 13:07:18.177841867 +0200
-+++ CMakeLists.txt	2016-04-07 13:09:39.449835926 +0200
-@@ -369,32 +369,32 @@
- # ----------------------------------------------------------------------------
- 
- # don't use FindGit because it requires CMake 2.8.2
--set(git_names git eg) # eg = easy git
-+#set(git_names git eg) # eg = easy git
- # Prefer .cmd variants on Windows unless running in a Makefile in the MSYS shell
--if(CMAKE_HOST_WIN32)
--  if(NOT CMAKE_GENERATOR MATCHES "MSYS")
--    set(git_names git.cmd git eg.cmd eg)
--  endif()
--endif()
--
--find_host_program(GIT_EXECUTABLE NAMES ${git_names} PATH_SUFFIXES Git/cmd Git/bin DOC "git command line client")
--mark_as_advanced(GIT_EXECUTABLE)
--
--if(GIT_EXECUTABLE)
--  execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty --match "2.[0-9].[0-9]*"
--    WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
--    OUTPUT_VARIABLE OPENCV_VCSVERSION
--    RESULT_VARIABLE GIT_RESULT
--    ERROR_QUIET
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  if(NOT GIT_RESULT EQUAL 0)
--    set(OPENCV_VCSVERSION "unknown")
--  endif()
--else()
-+#if(CMAKE_HOST_WIN32)
-+#  if(NOT CMAKE_GENERATOR MATCHES "MSYS")
-+#    set(git_names git.cmd git eg.cmd eg)
-+#  endif()
-+#endif()
-+
-+#find_host_program(GIT_EXECUTABLE NAMES ${git_names} PATH_SUFFIXES Git/cmd Git/bin DOC "git command line client")
-+#mark_as_advanced(GIT_EXECUTABLE)
-+
-+#if(GIT_EXECUTABLE)
-+#  execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty --match "2.[0-9].[0-9]*"
-+#    WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
-+#    OUTPUT_VARIABLE OPENCV_VCSVERSION
-+#    RESULT_VARIABLE GIT_RESULT
-+#    ERROR_QUIET
-+#    OUTPUT_STRIP_TRAILING_WHITESPACE
-+#  )
-+#  if(NOT GIT_RESULT EQUAL 0)
-+#    set(OPENCV_VCSVERSION "unknown")
-+#  endif()
-+#else()
-   # We don't have git:
--  set(OPENCV_VCSVERSION "unknown")
--endif()
-+#  set(OPENCV_VCSVERSION "unknown")
-+#endif()
- 
- 
- # ----------------------------------------------------------------------------
diff --git a/media-libs/opencv/files/opencv-2.4.9-libav10.patch b/media-libs/opencv/files/opencv-2.4.9-libav10.patch
deleted file mode 100644
index df517285e000..000000000000
--- a/media-libs/opencv/files/opencv-2.4.9-libav10.patch
+++ /dev/null
@@ -1,748 +0,0 @@
-From: anton@khirnov.net
-Description: Support building with the upcoming Libav 10 release
-Origin: upstream, https://github.com/Itseez/opencv/pull/2293
-
---- a/modules/highgui/src/cap_ffmpeg_impl.hpp
-+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
-@@ -57,10 +57,28 @@
- extern "C" {
- #endif
- 
--#include "ffmpeg_codecs.hpp"
-+#if !defined(WIN32) || defined(__MINGW32__)
- 
-+#include <stdint.h>
-+
-+// some versions of FFMPEG assume a C99 compiler, and don't define INT64_C
-+#ifndef INT64_C
-+#define INT64_C(c) (c##LL)
-+#endif
-+
-+#ifndef UINT64_C
-+#define UINT64_C(c) (c##ULL)
-+#endif
-+
-+#include <errno.h>
-+
-+#endif
-+
-+#include <libavformat/avformat.h>
- #include <libavutil/mathematics.h>
- 
-+#include <libavutil/opt.h>
-+
- #ifdef WIN32
-   #define HAVE_FFMPEG_SWSCALE 1
-   #include <libavcodec/avcodec.h>
-@@ -144,10 +162,6 @@ extern "C" {
- #define AV_NOPTS_VALUE_ ((int64_t)AV_NOPTS_VALUE)
- #endif
- 
--#ifndef AVERROR_EOF
--#define AVERROR_EOF (-MKTAG( 'E','O','F',' '))
--#endif
--
- #if LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(54,25,0)
- #  define CV_CODEC_ID AVCodecID
- #  define CV_CODEC(name) AV_##name
-@@ -158,9 +172,7 @@ extern "C" {
- 
- static int get_number_of_cpus(void)
- {
--#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(52, 111, 0)
--    return 1;
--#elif defined WIN32 || defined _WIN32
-+#if defined WIN32 || defined _WIN32
-     SYSTEM_INFO sysinfo;
-     GetSystemInfo( &sysinfo );
- 
-@@ -296,25 +308,13 @@ void CvCapture_FFMPEG::close()
- 
-     if( video_st )
-     {
--#if LIBAVFORMAT_BUILD > 4628
-         avcodec_close( video_st->codec );
--
--#else
--        avcodec_close( &(video_st->codec) );
--
--#endif
-         video_st = NULL;
-     }
- 
-     if( ic )
-     {
--#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 24, 2)
--        av_close_input_file(ic);
--#else
-         avformat_close_input(&ic);
--#endif
--
--        ic = NULL;
-     }
- 
-     if( rgb_picture.data[0] )
-@@ -501,9 +501,7 @@ public:
-         _mutex.lock();
-         if (!_initialized)
-         {
--    #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 13, 0)
-             avformat_network_init();
--    #endif
- 
-             /* register all codecs, demux and protocols */
-             av_register_all();
-@@ -534,11 +532,7 @@ bool CvCapture_FFMPEG::open( const char*
- 
-     close();
- 
--#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(52, 111, 0)
-     int err = avformat_open_input(&ic, _filename, NULL, NULL);
--#else
--    int err = av_open_input_file(&ic, _filename, NULL, 0, NULL);
--#endif
- 
-     if (err < 0)
-     {
-@@ -546,11 +540,7 @@ bool CvCapture_FFMPEG::open( const char*
-         goto exit_func;
-     }
-     err =
--#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 6, 0)
-     avformat_find_stream_info(ic, NULL);
--#else
--    av_find_stream_info(ic);
--#endif
-     if (err < 0)
-     {
-         CV_WARN("Could not find codec parameters");
-@@ -558,11 +548,7 @@ bool CvCapture_FFMPEG::open( const char*
-     }
-     for(i = 0; i < ic->nb_streams; i++)
-     {
--#if LIBAVFORMAT_BUILD > 4628
-         AVCodecContext *enc = ic->streams[i]->codec;
--#else
--        AVCodecContext *enc = &ic->streams[i]->codec;
--#endif
- 
- //#ifdef FF_API_THREAD_INIT
- //        avcodec_thread_init(enc, get_number_of_cpus());
-@@ -570,10 +556,6 @@ bool CvCapture_FFMPEG::open( const char*
-         enc->thread_count = get_number_of_cpus();
- //#endif
- 
--#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 2, 0)
--#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
--#endif
--
-         if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0)
-         {
-             // backup encoder' width/height
-@@ -581,13 +563,7 @@ bool CvCapture_FFMPEG::open( const char*
-             int enc_height = enc->height;
- 
-             AVCodec *codec = avcodec_find_decoder(enc->codec_id);
--            if (!codec ||
--#if LIBAVCODEC_VERSION_INT >= ((53<<16)+(8<<8)+0)
--                avcodec_open2(enc, codec, NULL)
--#else
--                avcodec_open(enc, codec)
--#endif
--                < 0)
-+            if (!codec || avcodec_open2(enc, codec, NULL) < 0)
-                 goto exit_func;
- 
-             // checking width/height (since decoder can sometimes alter it, eg. vp6f)
-@@ -660,17 +636,7 @@ bool CvCapture_FFMPEG::grabFrame()
-         }
- 
-         // Decode video frame
--        #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 2, 0)
-             avcodec_decode_video2(video_st->codec, picture, &got_picture, &packet);
--        #elif LIBAVFORMAT_BUILD > 4628
--                avcodec_decode_video(video_st->codec,
--                                     picture, &got_picture,
--                                     packet.data, packet.size);
--        #else
--                avcodec_decode_video(&video_st->codec,
--                                     picture, &got_picture,
--                                     packet.data, packet.size);
--        #endif
- 
-         // Did we get a video frame?
-         if(got_picture)
-@@ -769,18 +735,9 @@ double CvCapture_FFMPEG::getProperty( in
-     case CV_FFMPEG_CAP_PROP_FRAME_HEIGHT:
-         return (double)frame.height;
-     case CV_FFMPEG_CAP_PROP_FPS:
--#if LIBAVCODEC_BUILD > 4753
--        return av_q2d(video_st->r_frame_rate);
--#else
--        return (double)video_st->codec.frame_rate
--                / (double)video_st->codec.frame_rate_base;
--#endif
-+        return av_q2d(video_st->avg_frame_rate);
-     case CV_FFMPEG_CAP_PROP_FOURCC:
--#if LIBAVFORMAT_BUILD > 4628
-         return (double)video_st->codec->codec_tag;
--#else
--        return (double)video_st->codec.codec_tag;
--#endif
-     default:
-         break;
-     }
-@@ -817,14 +774,7 @@ int CvCapture_FFMPEG::get_bitrate()
- 
- double CvCapture_FFMPEG::get_fps()
- {
--    double fps = r2d(ic->streams[video_stream]->r_frame_rate);
--
--#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(52, 111, 0)
--    if (fps < eps_zero)
--    {
--        fps = r2d(ic->streams[video_stream]->avg_frame_rate);
--    }
--#endif
-+    double fps = r2d(ic->streams[video_stream]->avg_frame_rate);
- 
-     if (fps < eps_zero)
-     {
-@@ -984,7 +934,6 @@ struct CvVideoWriter_FFMPEG
- 
- static const char * icvFFMPEGErrStr(int err)
- {
--#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 2, 0)
-     switch(err) {
-     case AVERROR_BSF_NOT_FOUND:
-         return "Bitstream filter not found";
-@@ -1015,22 +964,6 @@ static const char * icvFFMPEGErrStr(int
-     default:
-         break;
-     }
--#else
--    switch(err) {
--    case AVERROR_NUMEXPECTED:
--        return "Incorrect filename syntax";
--    case AVERROR_INVALIDDATA:
--        return "Invalid data in header";
--    case AVERROR_NOFMT:
--        return "Unknown format";
--    case AVERROR_IO:
--        return "I/O error occurred";
--    case AVERROR_NOMEM:
--        return "Memory allocation error";
--    default:
--        break;
--    }
--#endif
- 
-     return "Unspecified error";
- }
-@@ -1098,28 +1031,16 @@ static AVStream *icv_add_video_stream_FF
-     int frame_rate, frame_rate_base;
-     AVCodec *codec;
- 
--#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 10, 0)
-     st = avformat_new_stream(oc, 0);
--#else
--    st = av_new_stream(oc, 0);
--#endif
- 
-     if (!st) {
-         CV_WARN("Could not allocate stream");
-         return NULL;
-     }
- 
--#if LIBAVFORMAT_BUILD > 4628
-     c = st->codec;
--#else
--    c = &(st->codec);
--#endif
- 
--#if LIBAVFORMAT_BUILD > 4621
-     c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO);
--#else
--    c->codec_id = oc->oformat->video_codec;
--#endif
- 
-     if(codec_id != CV_CODEC(CODEC_ID_NONE)){
-         c->codec_id = codec_id;
-@@ -1154,7 +1075,6 @@ static AVStream *icv_add_video_stream_FF
-         frame_rate_base*=10;
-         frame_rate=(int)(fps*frame_rate_base + 0.5);
-     }
--#if LIBAVFORMAT_BUILD > 4752
-     c->time_base.den = frame_rate;
-     c->time_base.num = frame_rate_base;
-     /* adjust time base for supported framerates */
-@@ -1174,10 +1094,6 @@ static AVStream *icv_add_video_stream_FF
-         c->time_base.den= best->num;
-         c->time_base.num= best->den;
-     }
--#else
--    c->frame_rate = frame_rate;
--    c->frame_rate_base = frame_rate_base;
--#endif
- 
-     c->gop_size = 12; /* emit one intra frame every twelve frames at most */
-     c->pix_fmt = (PixelFormat) pixel_format;
-@@ -1207,12 +1123,7 @@ static const int OPENCV_NO_FRAMES_WRITTE
- 
- static int icv_av_write_frame_FFMPEG( AVFormatContext * oc, AVStream * video_st, uint8_t * outbuf, uint32_t outbuf_size, AVFrame * picture )
- {
--#if LIBAVFORMAT_BUILD > 4628
-     AVCodecContext * c = video_st->codec;
--#else
--    AVCodecContext * c = &(video_st->codec);
--#endif
--    int out_size;
-     int ret = 0;
- 
-     if (oc->oformat->flags & AVFMT_RAWPICTURE) {
-@@ -1232,24 +1143,39 @@ static int icv_av_write_frame_FFMPEG( AV
- 
-         ret = av_write_frame(oc, &pkt);
-     } else {
-+        AVPacket pkt;
-+        int got_output;
-+
-+        av_init_packet(&pkt);
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 1, 0)
-         /* encode the image */
--        out_size = avcodec_encode_video(c, outbuf, outbuf_size, picture);
--        /* if zero size, it means the image was buffered */
--        if (out_size > 0) {
--            AVPacket pkt;
--            av_init_packet(&pkt);
--
--#if LIBAVFORMAT_BUILD > 4752
--            if(c->coded_frame->pts != (int64_t)AV_NOPTS_VALUE)
--                pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, video_st->time_base);
--#else
-+        int out_size = avcodec_encode_video(c, outbuf, outbuf_size, picture);
-+        got_output = out_size > 0;
-+        pkt.data   = outbuf;
-+        pkt.size   = out_size;
-+        if(c->coded_frame->pts != (int64_t)AV_NOPTS_VALUE)
-             pkt.pts = c->coded_frame->pts;
-+        pkt.dts = AV_NOPTS_VALUE;
-+        if(c->coded_frame->key_frame)
-+            pkt.flags |= PKT_FLAG_KEY;
-+#else
-+        pkt.data = NULL;
-+        pkt.size = 0;
-+
-+        ret = avcodec_encode_video2(c, &pkt, picture, &got_output);
-+        if (ret < 0)
-+            got_output = 0;
- #endif
--            if(c->coded_frame->key_frame)
--                pkt.flags |= PKT_FLAG_KEY;
-+
-+        if (got_output) {
-+            if (pkt.pts != (int64_t)AV_NOPTS_VALUE)
-+                pkt.pts = av_rescale_q(pkt.pts, c->time_base, video_st->time_base);
-+            if (pkt.dts != (int64_t)AV_NOPTS_VALUE)
-+                pkt.dts = av_rescale_q(pkt.dts, c->time_base, video_st->time_base);
-+            if (pkt.duration)
-+                pkt.duration = av_rescale_q(pkt.duration, c->time_base, video_st->time_base);
-+
-             pkt.stream_index= video_st->index;
--            pkt.data= outbuf;
--            pkt.size= out_size;
- 
-             /* write the compressed frame in the media file */
-             ret = av_write_frame(oc, &pkt);
-@@ -1271,30 +1197,8 @@ bool CvVideoWriter_FFMPEG::writeFrame( c
-     height = frame_height;
- 
-     // typecast from opaque data type to implemented struct
--#if LIBAVFORMAT_BUILD > 4628
-     AVCodecContext *c = video_st->codec;
--#else
--    AVCodecContext *c = &(video_st->codec);
--#endif
- 
--#if LIBAVFORMAT_BUILD < 5231
--    // It is not needed in the latest versions of the ffmpeg
--    if( c->codec_id == CV_CODEC(CODEC_ID_RAWVIDEO) && origin != 1 )
--    {
--        if( !temp_image.data )
--        {
--            temp_image.step = (width*cn + 3) & -4;
--            temp_image.width = width;
--            temp_image.height = height;
--            temp_image.cn = cn;
--            temp_image.data = (unsigned char*)malloc(temp_image.step*temp_image.height);
--        }
--        for( int y = 0; y < height; y++ )
--            memcpy(temp_image.data + y*temp_image.step, data + (height-1-y)*step, width*cn);
--        data = temp_image.data;
--        step = temp_image.step;
--    }
--#else
-     if( width*cn != step )
-     {
-         if( !temp_image.data )
-@@ -1314,7 +1218,6 @@ bool CvVideoWriter_FFMPEG::writeFrame( c
-         data = temp_image.data;
-         step = temp_image.step;
-     }
--#endif
- 
-     // check parameters
-     if (input_pix_fmt == PIX_FMT_BGR24) {
-@@ -1401,11 +1304,7 @@ void CvVideoWriter_FFMPEG::close()
-     }
- 
-     // free pictures
--#if LIBAVFORMAT_BUILD > 4628
-     if( video_st->codec->pix_fmt != input_pix_fmt)
--#else
--    if( video_st->codec.pix_fmt != input_pix_fmt)
--#endif
-     {
-         if(picture->data[0])
-             free(picture->data[0]);
-@@ -1417,11 +1316,7 @@ void CvVideoWriter_FFMPEG::close()
-         av_free(input_picture);
- 
-     /* close codec */
--#if LIBAVFORMAT_BUILD > 4628
-     avcodec_close(video_st->codec);
--#else
--    avcodec_close(&(video_st->codec));
--#endif
- 
-     av_free(outbuf);
- 
-@@ -1429,15 +1324,7 @@ void CvVideoWriter_FFMPEG::close()
-     {
-         /* close the output file */
- 
--#if LIBAVCODEC_VERSION_INT < ((52<<16)+(123<<8)+0)
--#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(49<<8)+0)
--        url_fclose(oc->pb);
--#else
--        url_fclose(&oc->pb);
--#endif
--#else
-         avio_close(oc->pb);
--#endif
- 
-     }
- 
-@@ -1479,11 +1366,7 @@ bool CvVideoWriter_FFMPEG::open( const c
- 
-     /* auto detect the output format from the name and fourcc code. */
- 
--#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 2, 0)
-     fmt = av_guess_format(NULL, filename, NULL);
--#else
--    fmt = guess_format(NULL, filename, NULL);
--#endif
- 
-     if (!fmt)
-         return false;
-@@ -1497,21 +1380,12 @@ bool CvVideoWriter_FFMPEG::open( const c
-     }
- 
-     /* Lookup codec_id for given fourcc */
--#if LIBAVCODEC_VERSION_INT<((51<<16)+(49<<8)+0)
--    if( (codec_id = codec_get_bmp_id( fourcc )) == CV_CODEC(CODEC_ID_NONE) )
--        return false;
--#else
--    const struct AVCodecTag * tags[] = { codec_bmp_tags, NULL};
-+    const struct AVCodecTag * tags[] = { avformat_get_riff_video_tags(), NULL};
-     if( (codec_id = av_codec_get_id(tags, fourcc)) == CV_CODEC(CODEC_ID_NONE) )
-         return false;
--#endif
- 
-     // alloc memory for context
--#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 2, 0)
-     oc = avformat_alloc_context();
--#else
--    oc = av_alloc_format_context();
--#endif
-     assert (oc);
- 
-     /* set file name */
-@@ -1523,12 +1397,10 @@ bool CvVideoWriter_FFMPEG::open( const c
- 
-     // set a few optimal pixel formats for lossless codecs of interest..
-     switch (codec_id) {
--#if LIBAVCODEC_VERSION_INT>((50<<16)+(1<<8)+0)
-     case CV_CODEC(CODEC_ID_JPEGLS):
-         // BGR24 or GRAY8 depending on is_color...
-         codec_pix_fmt = input_pix_fmt;
-         break;
--#endif
-     case CV_CODEC(CODEC_ID_HUFFYUV):
-         codec_pix_fmt = PIX_FMT_YUV422P;
-         break;
-@@ -1555,14 +1427,6 @@ bool CvVideoWriter_FFMPEG::open( const c
-                                            width, height, (int)(bitrate + 0.5),
-                                            fps, codec_pix_fmt);
- 
--    /* set the output parameters (must be done even if no
--   parameters). */
--#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 2, 0)
--    if (av_set_parameters(oc, NULL) < 0) {
--        return false;
--    }
--#endif
--
- #if 0
- #if FF_API_DUMP_FORMAT
-     dump_format(oc, 0, filename, 1);
-@@ -1580,23 +1444,14 @@ bool CvVideoWriter_FFMPEG::open( const c
-     AVCodec *codec;
-     AVCodecContext *c;
- 
--#if LIBAVFORMAT_BUILD > 4628
-     c = (video_st->codec);
--#else
--    c = &(video_st->codec);
--#endif
- 
-     c->codec_tag = fourcc;
-     /* find the video encoder */
-     codec = avcodec_find_encoder(c->codec_id);
-     if (!codec) {
-         fprintf(stderr, "Could not find encoder for codec id %d: %s", c->codec_id, icvFFMPEGErrStr(
--        #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 2, 0)
--                AVERROR_ENCODER_NOT_FOUND
--        #else
--                -1
--        #endif
--                ));
-+                AVERROR_ENCODER_NOT_FOUND));
-         return false;
-     }
- 
-@@ -1607,13 +1462,7 @@ bool CvVideoWriter_FFMPEG::open( const c
-     c->bit_rate = (int)lbit_rate;
- 
-     /* open the codec */
--    if ((err=
--#if LIBAVCODEC_VERSION_INT >= ((53<<16)+(8<<8)+0)
--         avcodec_open2(c, codec, NULL)
--#else
--         avcodec_open(c, codec)
--#endif
--         ) < 0) {
-+    if ((err = avcodec_open2(c, codec, NULL)) < 0) {
-         fprintf(stderr, "Could not open codec '%s': %s", codec->name, icvFFMPEGErrStr(err));
-         return false;
-     }
-@@ -1649,22 +1498,14 @@ bool CvVideoWriter_FFMPEG::open( const c
- 
-     /* open the output file, if needed */
-     if (!(fmt->flags & AVFMT_NOFILE)) {
--#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 2, 0)
--        if (url_fopen(&oc->pb, filename, URL_WRONLY) < 0)
--#else
-             if (avio_open(&oc->pb, filename, AVIO_FLAG_WRITE) < 0)
--#endif
-             {
-             return false;
-         }
-     }
- 
--#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(52, 111, 0)
-     /* write the stream header, if any */
-     err=avformat_write_header(oc, NULL);
--#else
--    err=av_write_header( oc );
--#endif
- 
-     if(err < 0)
-     {
-@@ -1799,15 +1640,7 @@ void OutputMediaStream_FFMPEG::close()
-         {
-             // close the output file
- 
--            #if LIBAVCODEC_VERSION_INT < ((52<<16)+(123<<8)+0)
--                #if LIBAVCODEC_VERSION_INT >= ((51<<16)+(49<<8)+0)
--                    url_fclose(oc_->pb);
--                #else
--                    url_fclose(&oc_->pb);
--                #endif
--            #else
--                avio_close(oc_->pb);
--            #endif
-+            avio_close(oc_->pb);
-         }
- 
-         // free the stream
-@@ -1817,19 +1650,11 @@ void OutputMediaStream_FFMPEG::close()
- 
- AVStream* OutputMediaStream_FFMPEG::addVideoStream(AVFormatContext *oc, CV_CODEC_ID codec_id, int w, int h, int bitrate, double fps, PixelFormat pixel_format)
- {
--    #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 10, 0)
-         AVStream* st = avformat_new_stream(oc, 0);
--    #else
--        AVStream* st = av_new_stream(oc, 0);
--    #endif
-     if (!st)
-         return 0;
- 
--    #if LIBAVFORMAT_BUILD > 4628
-         AVCodecContext* c = st->codec;
--    #else
--        AVCodecContext* c = &(st->codec);
--    #endif
- 
-     c->codec_id = codec_id;
-     c->codec_type = AVMEDIA_TYPE_VIDEO;
-@@ -1865,7 +1690,6 @@ AVStream* OutputMediaStream_FFMPEG::addV
-     c->time_base.den = frame_rate;
-     c->time_base.num = frame_rate_base;
- 
--    #if LIBAVFORMAT_BUILD > 4752
-         // adjust time base for supported framerates
-         if (codec && codec->supported_framerates)
-         {
-@@ -1890,7 +1714,6 @@ AVStream* OutputMediaStream_FFMPEG::addV
-             c->time_base.den= best->num;
-             c->time_base.num= best->den;
-         }
--    #endif
- 
-     c->gop_size = 12; // emit one intra frame every twelve frames at most
-     c->pix_fmt = pixel_format;
-@@ -1909,13 +1732,11 @@ AVStream* OutputMediaStream_FFMPEG::addV
-         c->mb_decision = 2;
-     }
- 
--    #if LIBAVCODEC_VERSION_INT > 0x000409
-         // some formats want stream headers to be seperate
-         if (oc->oformat->flags & AVFMT_GLOBALHEADER)
-         {
-             c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-         }
--    #endif
- 
-     return st;
- }
-@@ -1927,22 +1748,14 @@ bool OutputMediaStream_FFMPEG::open(cons
-     video_st_ = 0;
- 
-     // auto detect the output format from the name and fourcc code
--    #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 2, 0)
-         fmt_ = av_guess_format(NULL, fileName, NULL);
--    #else
--        fmt_ = guess_format(NULL, fileName, NULL);
--    #endif
-     if (!fmt_)
-         return false;
- 
-     CV_CODEC_ID codec_id = CV_CODEC(CODEC_ID_H264);
- 
-     // alloc memory for context
--    #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 2, 0)
-         oc_ = avformat_alloc_context();
--    #else
--        oc_ = av_alloc_format_context();
--    #endif
-     if (!oc_)
-         return false;
- 
-@@ -1961,20 +1774,10 @@ bool OutputMediaStream_FFMPEG::open(cons
-     if (!video_st_)
-         return false;
- 
--    // set the output parameters (must be done even if no parameters)
--    #if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 2, 0)
--        if (av_set_parameters(oc_, NULL) < 0)
--            return false;
--    #endif
--
-     // now that all the parameters are set, we can open the audio and
-     // video codecs and allocate the necessary encode buffers
- 
--    #if LIBAVFORMAT_BUILD > 4628
-         AVCodecContext* c = (video_st_->codec);
--    #else
--        AVCodecContext* c = &(video_st_->codec);
--    #endif
- 
-     c->codec_tag = MKTAG('H', '2', '6', '4');
-     c->bit_rate_tolerance = c->bit_rate;
-@@ -1982,22 +1785,14 @@ bool OutputMediaStream_FFMPEG::open(cons
-     // open the output file, if needed
-     if (!(fmt_->flags & AVFMT_NOFILE))
-     {
--        #if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 2, 0)
--            int err = url_fopen(&oc_->pb, fileName, URL_WRONLY);
--        #else
--            int err = avio_open(&oc_->pb, fileName, AVIO_FLAG_WRITE);
--        #endif
-+        int err = avio_open(&oc_->pb, fileName, AVIO_FLAG_WRITE);
- 
-         if (err != 0)
-             return false;
-     }
- 
-     // write the stream header, if any
--    #if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 2, 0)
--        av_write_header(oc_);
--    #else
--        avformat_write_header(oc_, NULL);
--    #endif
-+    avformat_write_header(oc_, NULL);
- 
-     return true;
- }
-@@ -2102,33 +1897,19 @@ bool InputMediaStream_FFMPEG::open(const
-     video_stream_id_ = -1;
-     memset(&pkt_, 0, sizeof(AVPacket));
- 
--    #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 13, 0)
--        avformat_network_init();
--    #endif
--
--    #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 6, 0)
--        err = avformat_open_input(&ctx_, fileName, 0, 0);
--    #else
--        err = av_open_input_file(&ctx_, fileName, 0, 0, 0);
--    #endif
-+    avformat_network_init();
-+
-+    err = avformat_open_input(&ctx_, fileName, 0, 0);
-     if (err < 0)
-         return false;
- 
--    #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 6, 0)
--        err = avformat_find_stream_info(ctx_, 0);
--    #else
--        err = av_find_stream_info(ctx_);
--    #endif
-+    err = avformat_find_stream_info(ctx_, 0);
-     if (err < 0)
-         return false;
- 
-     for (unsigned int i = 0; i < ctx_->nb_streams; ++i)
-     {
--        #if LIBAVFORMAT_BUILD > 4628
-             AVCodecContext *enc = ctx_->streams[i]->codec;
--        #else
--            AVCodecContext *enc = &ctx_->streams[i]->codec;
--        #endif
- 
-         if (enc->codec_type == AVMEDIA_TYPE_VIDEO)
-         {
-@@ -2197,11 +1978,7 @@ void InputMediaStream_FFMPEG::close()
- {
-     if (ctx_)
-     {
--        #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 24, 2)
--            avformat_close_input(&ctx_);
--        #else
--            av_close_input_file(ctx_);
--        #endif
-+        avformat_close_input(&ctx_);
-     }
- 
-     // free last packet if exist