graphics/opencv: unbreak build with ffmpeg 3.0

modules/highgui/src/ffmpeg_codecs.hpp:104:7: error: use of undeclared identifier 'CODEC_ID_H264'; did you mean 'AV_CODEC_ID_H264'?
    { CODEC_ID_H264, MKTAG('H', '2', '6', '4') },
      ^~~~~~~~~~~~~
modules/highgui/src/ffmpeg_codecs.hpp:121:7: error: use of undeclared identifier 'CODEC_ID_MPEG4'; did you mean 'AV_CODEC_ID_MPEG4'?
    { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') },
      ^~~~~~~~~~~~~~
[...]

PR:		208895
Reported by:	antoine (via exp-run)
Submitted by:	Ben Woods <woodsb02@gmail.com>
Approved by:	maintainer timeout (jhale, 3 weeks)
Obtained from:	Debian

3 files changed, 970 insertions, 1 deletions

diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index c16f6f6d2483..c16be1cfbe06 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	opencv
 PORTVERSION=	2.4.9
-PORTREVISION?=	7
+PORTREVISION?=	8
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}library/${PORTNAME}-unix/${PORTVERSION}
 
diff --git a/graphics/opencv/files/patch-ffmpeg29 b/graphics/opencv/files/patch-ffmpeg29
new file mode 100644
index 000000000000..f7245cd44a6d
--- /dev/null
+++ b/graphics/opencv/files/patch-ffmpeg29
@@ -0,0 +1,221 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
+Last-Update: <2015-11-02>
+
+--- modules/highgui/src/cap_ffmpeg_impl.hpp.orig
++++ modules/highgui/src/cap_ffmpeg_impl.hpp
+@@ -136,9 +136,9 @@ extern "C" {
+ #define CV_WARN(message) fprintf(stderr, "warning: %s (%s:%d)\n", message, __FILE__, __LINE__)
+ #endif
+ 
+-/* PIX_FMT_RGBA32 macro changed in newer ffmpeg versions */
+-#ifndef PIX_FMT_RGBA32
+-#define PIX_FMT_RGBA32 PIX_FMT_RGB32
++/* AV_PIX_FMT_RGBA32 macro changed in newer ffmpeg versions */
++#ifndef AV_PIX_FMT_RGBA32
++#define AV_PIX_FMT_RGBA32 AV_PIX_FMT_RGB32
+ #endif
+ 
+ #define CALC_FFMPEG_VERSION(a,b,c) ( a<<16 | b<<8 | c )
+@@ -304,7 +304,7 @@ void CvCapture_FFMPEG::close()
+     }
+ 
+     if( picture )
+-        av_free(picture);
++        av_frame_free(&picture);
+ 
+     if( video_st )
+     {
+@@ -572,13 +572,13 @@ bool CvCapture_FFMPEG::open( const char*
+ 
+             video_stream = i;
+             video_st = ic->streams[i];
+-            picture = avcodec_alloc_frame();
++            picture = av_frame_alloc();
+ 
+             rgb_picture.data[0] = (uint8_t*)malloc(
+-                    avpicture_get_size( PIX_FMT_BGR24,
++                    avpicture_get_size( AV_PIX_FMT_BGR24,
+                                         enc->width, enc->height ));
+             avpicture_fill( (AVPicture*)&rgb_picture, rgb_picture.data[0],
+-                            PIX_FMT_BGR24, enc->width, enc->height );
++                            AV_PIX_FMT_BGR24, enc->width, enc->height );
+ 
+             frame.width = enc->width;
+             frame.height = enc->height;
+@@ -670,7 +670,7 @@ bool CvCapture_FFMPEG::retrieveFrame(int
+     if( !video_st || !picture->data[0] )
+         return false;
+ 
+-    avpicture_fill((AVPicture*)&rgb_picture, rgb_picture.data[0], PIX_FMT_RGB24,
++    avpicture_fill((AVPicture*)&rgb_picture, rgb_picture.data[0], AV_PIX_FMT_RGB24,
+                    video_st->codec->width, video_st->codec->height);
+ 
+     if( img_convert_ctx == NULL ||
+@@ -688,7 +688,7 @@ bool CvCapture_FFMPEG::retrieveFrame(int
+                 video_st->codec->width, video_st->codec->height,
+                 video_st->codec->pix_fmt,
+                 video_st->codec->width, video_st->codec->height,
+-                PIX_FMT_BGR24,
++                AV_PIX_FMT_BGR24,
+                 SWS_BICUBIC,
+                 NULL, NULL, NULL
+                 );
+@@ -1001,10 +1001,10 @@ static AVFrame * icv_alloc_picture_FFMPE
+     uint8_t * picture_buf;
+     int size;
+ 
+-    picture = avcodec_alloc_frame();
++    picture = av_frame_alloc();
+     if (!picture)
+         return NULL;
+-    size = avpicture_get_size( (PixelFormat) pix_fmt, width, height);
++    size = avpicture_get_size( (AVPixelFormat) pix_fmt, width, height);
+     if(alloc){
+         picture_buf = (uint8_t *) malloc(size);
+         if (!picture_buf)
+@@ -1013,7 +1013,7 @@ static AVFrame * icv_alloc_picture_FFMPE
+             return NULL;
+         }
+         avpicture_fill((AVPicture *)picture, picture_buf,
+-                       (PixelFormat) pix_fmt, width, height);
++                       (AVPixelFormat) pix_fmt, width, height);
+     }
+     else {
+     }
+@@ -1096,7 +1096,7 @@ static AVStream *icv_add_video_stream_FF
+     }
+ 
+     c->gop_size = 12; /* emit one intra frame every twelve frames at most */
+-    c->pix_fmt = (PixelFormat) pixel_format;
++    c->pix_fmt = (AVPixelFormat) pixel_format;
+ 
+     if (c->codec_id == CV_CODEC(CODEC_ID_MPEG2VIDEO)) {
+         c->max_b_frames = 2;
+@@ -1220,12 +1220,12 @@ bool CvVideoWriter_FFMPEG::writeFrame( c
+     }
+ 
+     // check parameters
+-    if (input_pix_fmt == PIX_FMT_BGR24) {
++    if (input_pix_fmt == AV_PIX_FMT_BGR24) {
+         if (cn != 3) {
+             return false;
+         }
+     }
+-    else if (input_pix_fmt == PIX_FMT_GRAY8) {
++    else if (input_pix_fmt == AV_PIX_FMT_GRAY8) {
+         if (cn != 1) {
+             return false;
+         }
+@@ -1238,13 +1238,13 @@ bool CvVideoWriter_FFMPEG::writeFrame( c
+         assert( input_picture );
+         // let input_picture point to the raw data buffer of 'image'
+         avpicture_fill((AVPicture *)input_picture, (uint8_t *) data,
+-                       (PixelFormat)input_pix_fmt, width, height);
++                       (AVPixelFormat)input_pix_fmt, width, height);
+ 
+         if( !img_convert_ctx )
+         {
+             img_convert_ctx = sws_getContext(width,
+                                              height,
+-                                             (PixelFormat)input_pix_fmt,
++                                             (AVPixelFormat)input_pix_fmt,
+                                              c->width,
+                                              c->height,
+                                              c->pix_fmt,
+@@ -1262,7 +1262,7 @@ bool CvVideoWriter_FFMPEG::writeFrame( c
+     }
+     else{
+         avpicture_fill((AVPicture *)picture, (uint8_t *) data,
+-                       (PixelFormat)input_pix_fmt, width, height);
++                       (AVPixelFormat)input_pix_fmt, width, height);
+     }
+ 
+     ret = icv_av_write_frame_FFMPEG( oc, video_st, outbuf, outbuf_size, picture) >= 0;
+@@ -1373,10 +1373,10 @@ bool CvVideoWriter_FFMPEG::open( const c
+ 
+     /* determine optimal pixel format */
+     if (is_color) {
+-        input_pix_fmt = PIX_FMT_BGR24;
++        input_pix_fmt = AV_PIX_FMT_BGR24;
+     }
+     else {
+-        input_pix_fmt = PIX_FMT_GRAY8;
++        input_pix_fmt = AV_PIX_FMT_GRAY8;
+     }
+ 
+     /* Lookup codec_id for given fourcc */
+@@ -1402,21 +1402,21 @@ bool CvVideoWriter_FFMPEG::open( const c
+         codec_pix_fmt = input_pix_fmt;
+         break;
+     case CV_CODEC(CODEC_ID_HUFFYUV):
+-        codec_pix_fmt = PIX_FMT_YUV422P;
++        codec_pix_fmt = AV_PIX_FMT_YUV422P;
+         break;
+     case CV_CODEC(CODEC_ID_MJPEG):
+     case CV_CODEC(CODEC_ID_LJPEG):
+-        codec_pix_fmt = PIX_FMT_YUVJ420P;
++        codec_pix_fmt = AV_PIX_FMT_YUVJ420P;
+         bitrate_scale = 3;
+         break;
+     case CV_CODEC(CODEC_ID_RAWVIDEO):
+-        codec_pix_fmt = input_pix_fmt == PIX_FMT_GRAY8 ||
+-                        input_pix_fmt == PIX_FMT_GRAY16LE ||
+-                        input_pix_fmt == PIX_FMT_GRAY16BE ? input_pix_fmt : PIX_FMT_YUV420P;
++        codec_pix_fmt = input_pix_fmt == AV_PIX_FMT_GRAY8 ||
++                        input_pix_fmt == AV_PIX_FMT_GRAY16LE ||
++                        input_pix_fmt == AV_PIX_FMT_GRAY16BE ? input_pix_fmt : AV_PIX_FMT_YUV420P;
+         break;
+     default:
+         // good for lossy formats, MPEG, etc.
+-        codec_pix_fmt = PIX_FMT_YUV420P;
++        codec_pix_fmt = AV_PIX_FMT_YUV420P;
+         break;
+     }
+ 
+@@ -1609,7 +1609,7 @@ struct OutputMediaStream_FFMPEG
+     void write(unsigned char* data, int size, int keyFrame);
+ 
+     // add a video output stream to the container
+-    static AVStream* addVideoStream(AVFormatContext *oc, CV_CODEC_ID codec_id, int w, int h, int bitrate, double fps, PixelFormat pixel_format);
++    static AVStream* addVideoStream(AVFormatContext *oc, CV_CODEC_ID codec_id, int w, int h, int bitrate, double fps, AVPixelFormat pixel_format);
+ 
+     AVOutputFormat* fmt_;
+     AVFormatContext* oc_;
+@@ -1648,7 +1648,7 @@ 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)
++AVStream* OutputMediaStream_FFMPEG::addVideoStream(AVFormatContext *oc, CV_CODEC_ID codec_id, int w, int h, int bitrate, double fps, AVPixelFormat pixel_format)
+ {
+         AVStream* st = avformat_new_stream(oc, 0);
+     if (!st)
+@@ -1766,7 +1766,7 @@ bool OutputMediaStream_FFMPEG::open(cons
+     oc_->max_delay = (int)(0.7 * AV_TIME_BASE); // This reduces buffer underrun warnings with MPEG
+ 
+     // set a few optimal pixel formats for lossless codecs of interest..
+-    PixelFormat codec_pix_fmt = PIX_FMT_YUV420P;
++    AVPixelFormat codec_pix_fmt = AV_PIX_FMT_YUV420P;
+     int bitrate_scale = 64;
+ 
+     // TODO -- safe to ignore output audio stream?
+@@ -1943,15 +1943,15 @@ bool InputMediaStream_FFMPEG::open(const
+ 
+             switch (enc->pix_fmt)
+             {
+-            case PIX_FMT_YUV420P:
++            case AV_PIX_FMT_YUV420P:
+                 *chroma_format = ::VideoChromaFormat_YUV420;
+                 break;
+ 
+-            case PIX_FMT_YUV422P:
++            case AV_PIX_FMT_YUV422P:
+                 *chroma_format = ::VideoChromaFormat_YUV422;
+                 break;
+ 
+-            case PIX_FMT_YUV444P:
++            case AV_PIX_FMT_YUV444P:
+                 *chroma_format = ::VideoChromaFormat_YUV444;
+                 break;
+ 
diff --git a/graphics/opencv/files/patch-libav10 b/graphics/opencv/files/patch-libav10
new file mode 100644
index 000000000000..4e9255974989
--- /dev/null
+++ b/graphics/opencv/files/patch-libav10
@@ -0,0 +1,748 @@
+From: anton@khirnov.net
+Description: Support building with the upcoming Libav 10 release
+Origin: upstream, https://github.com/Itseez/opencv/pull/2293
+
+--- modules/highgui/src/cap_ffmpeg_impl.hpp.orig
++++ 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