diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2016-12-05 13:01:21 +0100 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2016-12-05 13:01:21 +0100 |
| commit | ccb501a9bcc1e327c3c4875973845102083e95f8 (patch) | |
| tree | 7d5f55712193a7261532156bfa49e5bce0d1e95f | |
| parent | media-plugins/vdr-osdpip: apply freebsd patch to build with ffmpeg3, bug #575100 (diff) | |
| download | gentoo-ccb501a9bcc1e327c3c4875973845102083e95f8.tar.gz gentoo-ccb501a9bcc1e327c3c4875973845102083e95f8.tar.bz2 gentoo-ccb501a9bcc1e327c3c4875973845102083e95f8.zip | |
media-plugins/vdr-image: fix build with ffmpeg3, bug #575280
Package-Manager: portage-2.3.2
| -rw-r--r-- | media-plugins/vdr-image/files/vdr-image-0.4.0-ffmpeg3.patch | 40 | ||||
| -rw-r--r-- | media-plugins/vdr-image/vdr-image-0.4.0.ebuild | 5 |
2 files changed, 43 insertions, 2 deletions
diff --git a/media-plugins/vdr-image/files/vdr-image-0.4.0-ffmpeg3.patch b/media-plugins/vdr-image/files/vdr-image-0.4.0-ffmpeg3.patch new file mode 100644 index 000000000000..de0ca025e165 --- /dev/null +++ b/media-plugins/vdr-image/files/vdr-image-0.4.0-ffmpeg3.patch @@ -0,0 +1,40 @@ +Index: image-0.4.0/liboutput/encode.c +=================================================================== +--- image-0.4.0.orig/liboutput/encode.c ++++ image-0.4.0/liboutput/encode.c +@@ -150,7 +150,7 @@ void cEncode::SetupEncodingParameters(AV + } + 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(AVFram + // 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(AVFram + { + 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"); diff --git a/media-plugins/vdr-image/vdr-image-0.4.0.ebuild b/media-plugins/vdr-image/vdr-image-0.4.0.ebuild index e32472c395c4..0e74b9896ea9 100644 --- a/media-plugins/vdr-image/vdr-image-0.4.0.ebuild +++ b/media-plugins/vdr-image/vdr-image-0.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -40,7 +40,8 @@ src_prepare() { # dangerous warning sed -e "s:mktemp:mkstemp:" -i data-image.c - epatch "${FILESDIR}/${P}-gentoo.diff" + epatch "${FILESDIR}/${P}-gentoo.diff" \ + "${FILESDIR}/${P}-ffmpeg3.patch" # ffmpeg-2.2.12, libav10 sed -e "s:avcodec_alloc_frame:av_frame_alloc:" \ |