diff options
| author | anbr <vdr07@deltab.de> | 2017-03-27 19:49:54 +0200 |
|---|---|---|
| committer | anbr <vdr07@deltab.de> | 2017-03-27 19:49:54 +0200 |
| commit | 2a72e9949517f14759b3b314204ee92fbf4b9a39 (patch) | |
| tree | 3431c7a7f914fdce780b4ebdc52946361adbe00a | |
| parent | a870d4e2b0de36dc3835d67d502f30cfc3898a40 (diff) | |
| download | vdr-plugin-image-2a72e9949517f14759b3b314204ee92fbf4b9a39.tar.gz vdr-plugin-image-2a72e9949517f14759b3b314204ee92fbf4b9a39.tar.bz2 | |
Add ffmpeg-3.x.patch (Closes: #2485)
| -rw-r--r-- | liboutput/encode.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/liboutput/encode.c b/liboutput/encode.c index 549f440..c1c358b 100644 --- a/liboutput/encode.c +++ b/liboutput/encode.c @@ -1,7 +1,7 @@ /* * Image plugin to VDR (C++) * - * (C) 2004-2011 Andreas Brachold <vdr07 at deltab.de> + * (C) 2004-2017 Andreas Brachold <vdr07 at deltab.de> * Created: Thu Aug 5 2004 * * This code is distributed under the terms and conditions of the @@ -52,7 +52,7 @@ bool cEncode::Register() av_register_all(); avcodec_register_all(); - m_pavCodec = avcodec_find_encoder(CODEC_ID_MPEG2VIDEO); + m_pavCodec = avcodec_find_encoder(AV_CODEC_ID_MPEG2VIDEO); if (!m_pavCodec) { esyslog("imageplugin: Failed to find CODEC_ID_MPEG2VIDEO."); return false; @@ -102,7 +102,7 @@ bool cEncode::Encode() } else { - pAVF = avcodec_alloc_frame(); + pAVF = av_frame_alloc(); if (! pAVF) { esyslog("imageplugin: Failed to alloc memory for AVFrame."); @@ -150,7 +150,7 @@ void cEncode::SetupEncodingParameters(AVCodecContext *context) } context->max_b_frames=1; context->flags |= CODEC_FLAG_QSCALE; - context->pix_fmt = PIX_FMT_YUV420P; + context->pix_fmt = AV_PIX_FMT_YUV420P; } bool cEncode::ConvertImageToFrame(AVFrame *frame) @@ -173,7 +173,7 @@ bool cEncode::ConvertImageToFrame(AVFrame *frame) // Convert RGB to YUV if(!avpicture_fill((AVPicture*)m_pImageFilled, m_pImageRGB, - PIX_FMT_RGB24, m_nWidth, m_nHeight)) + AV_PIX_FMT_RGB24, m_nWidth, m_nHeight)) { esyslog("imageplugin: failed avpicture_fill"); return false; @@ -182,13 +182,13 @@ bool cEncode::ConvertImageToFrame(AVFrame *frame) { int result; #ifndef HAVE_SWSCALER - result=img_convert((AVPicture*)frame->data, PIX_FMT_YUV420P, - (AVPicture*)m_pImageFilled, PIX_FMT_RGB24, + result=img_convert((AVPicture*)frame->data, AV_PIX_FMT_YUV420P, + (AVPicture*)m_pImageFilled, AV_PIX_FMT_RGB24, m_nWidth, m_nHeight); #else SwsContext* convert_ctx = sws_getContext(m_nWidth, m_nHeight, - PIX_FMT_RGB24, m_nWidth, m_nHeight, - PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL); + AV_PIX_FMT_RGB24, m_nWidth, m_nHeight, + AV_PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL); if(!convert_ctx) { esyslog("imageplugin: failed to initialize swscaler context"); |