| 1 |
commit: ccb501a9bcc1e327c3c4875973845102083e95f8 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 5 12:01:21 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 5 12:01:21 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccb501a9 |
| 7 |
|
| 8 |
media-plugins/vdr-image: fix build with ffmpeg3, bug #575280 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
.../vdr-image/files/vdr-image-0.4.0-ffmpeg3.patch | 40 ++++++++++++++++++++++ |
| 13 |
media-plugins/vdr-image/vdr-image-0.4.0.ebuild | 5 +-- |
| 14 |
2 files changed, 43 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
new file mode 100644 |
| 18 |
index 00000000..de0ca02 |
| 19 |
--- /dev/null |
| 20 |
+++ b/media-plugins/vdr-image/files/vdr-image-0.4.0-ffmpeg3.patch |
| 21 |
@@ -0,0 +1,40 @@ |
| 22 |
+Index: image-0.4.0/liboutput/encode.c |
| 23 |
+=================================================================== |
| 24 |
+--- image-0.4.0.orig/liboutput/encode.c |
| 25 |
++++ image-0.4.0/liboutput/encode.c |
| 26 |
+@@ -150,7 +150,7 @@ void cEncode::SetupEncodingParameters(AV |
| 27 |
+ } |
| 28 |
+ context->max_b_frames=1; |
| 29 |
+ context->flags |= CODEC_FLAG_QSCALE; |
| 30 |
+- context->pix_fmt = PIX_FMT_YUV420P; |
| 31 |
++ context->pix_fmt = AV_PIX_FMT_YUV420P; |
| 32 |
+ } |
| 33 |
+ |
| 34 |
+ bool cEncode::ConvertImageToFrame(AVFrame *frame) |
| 35 |
+@@ -173,7 +173,7 @@ bool cEncode::ConvertImageToFrame(AVFram |
| 36 |
+ // Convert RGB to YUV |
| 37 |
+ if(!avpicture_fill((AVPicture*)m_pImageFilled, |
| 38 |
+ m_pImageRGB, |
| 39 |
+- PIX_FMT_RGB24, m_nWidth, m_nHeight)) |
| 40 |
++ AV_PIX_FMT_RGB24, m_nWidth, m_nHeight)) |
| 41 |
+ { |
| 42 |
+ esyslog("imageplugin: failed avpicture_fill"); |
| 43 |
+ return false; |
| 44 |
+@@ -182,13 +182,13 @@ bool cEncode::ConvertImageToFrame(AVFram |
| 45 |
+ { |
| 46 |
+ int result; |
| 47 |
+ #ifndef HAVE_SWSCALER |
| 48 |
+- result=img_convert((AVPicture*)frame->data, PIX_FMT_YUV420P, |
| 49 |
+- (AVPicture*)m_pImageFilled, PIX_FMT_RGB24, |
| 50 |
++ result=img_convert((AVPicture*)frame->data, AV_PIX_FMT_YUV420P, |
| 51 |
++ (AVPicture*)m_pImageFilled, AV_PIX_FMT_RGB24, |
| 52 |
+ m_nWidth, m_nHeight); |
| 53 |
+ #else |
| 54 |
+ SwsContext* convert_ctx = sws_getContext(m_nWidth, m_nHeight, |
| 55 |
+- PIX_FMT_RGB24, m_nWidth, m_nHeight, |
| 56 |
+- PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL); |
| 57 |
++ AV_PIX_FMT_RGB24, m_nWidth, m_nHeight, |
| 58 |
++ AV_PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL); |
| 59 |
+ |
| 60 |
+ if(!convert_ctx) { |
| 61 |
+ esyslog("imageplugin: failed to initialize swscaler context"); |
| 62 |
|
| 63 |
diff --git a/media-plugins/vdr-image/vdr-image-0.4.0.ebuild b/media-plugins/vdr-image/vdr-image-0.4.0.ebuild |
| 64 |
index e32472c..0e74b98 100644 |
| 65 |
--- a/media-plugins/vdr-image/vdr-image-0.4.0.ebuild |
| 66 |
+++ b/media-plugins/vdr-image/vdr-image-0.4.0.ebuild |
| 67 |
@@ -1,4 +1,4 @@ |
| 68 |
-# Copyright 1999-2015 Gentoo Foundation |
| 69 |
+# Copyright 1999-2016 Gentoo Foundation |
| 70 |
# Distributed under the terms of the GNU General Public License v2 |
| 71 |
# $Id$ |
| 72 |
|
| 73 |
@@ -40,7 +40,8 @@ src_prepare() { |
| 74 |
# dangerous warning |
| 75 |
sed -e "s:mktemp:mkstemp:" -i data-image.c |
| 76 |
|
| 77 |
- epatch "${FILESDIR}/${P}-gentoo.diff" |
| 78 |
+ epatch "${FILESDIR}/${P}-gentoo.diff" \ |
| 79 |
+ "${FILESDIR}/${P}-ffmpeg3.patch" |
| 80 |
|
| 81 |
# ffmpeg-2.2.12, libav10 |
| 82 |
sed -e "s:avcodec_alloc_frame:av_frame_alloc:" \ |
Archives