summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2016-12-05 13:01:21 +0100
committerAlexis Ballier <aballier@gentoo.org>2016-12-05 13:01:21 +0100
commitccb501a9bcc1e327c3c4875973845102083e95f8 (patch)
tree7d5f55712193a7261532156bfa49e5bce0d1e95f /media-plugins/vdr-image/files
parentmedia-plugins/vdr-osdpip: apply freebsd patch to build with ffmpeg3, bug #575100 (diff)
downloadgentoo-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
Diffstat (limited to 'media-plugins/vdr-image/files')
-rw-r--r--media-plugins/vdr-image/files/vdr-image-0.4.0-ffmpeg3.patch40
1 files changed, 40 insertions, 0 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");