From 624ab7e76a34165acea637d0016be45ab20f310f Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Thu, 9 Jun 2016 23:39:34 +0000 Subject: [PATCH] Fixed compatibility when compiling against FFmpeg 2.9 and newer. --- ffmpeg_2.9.patch | 15 +++++++++++++++ libde265.spec | 6 ++++++ 2 files changed, 21 insertions(+) create mode 100644 ffmpeg_2.9.patch diff --git a/ffmpeg_2.9.patch b/ffmpeg_2.9.patch new file mode 100644 index 0000000..2c08cb0 --- /dev/null +++ b/ffmpeg_2.9.patch @@ -0,0 +1,15 @@ +Description: Replace deprecated FFmpeg API +Author: Andreas Cadhalpun +Last-Update: <2015-11-02> + +--- libde265-1.0.2.orig/sherlock265/VideoDecoder.cc ++++ libde265-1.0.2/sherlock265/VideoDecoder.cc +@@ -219,7 +219,7 @@ void VideoDecoder::convert_frame_swscale + } + width = img->get_width(); + height = img->get_height(); +- sws = sws_getContext(width, height, PIX_FMT_YUV420P, width, height, PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL); ++ sws = sws_getContext(width, height, AV_PIX_FMT_YUV420P, width, height, AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL); + } + + int stride[3]; diff --git a/libde265.spec b/libde265.spec index f365467..0cf7b24 100644 --- a/libde265.spec +++ b/libde265.spec @@ -15,6 +15,9 @@ BuildRequires: pkgconfig(QtCore) BuildRequires: pkgconfig(QtGui) BuildRequires: pkgconfig(sdl) +# Fix compatibiliy when compiling against FFmpeg 2.9 and newer. +Patch0: ffmpeg_2.9.patch + %description libde265 is an open source implementation of the H.265 video codec. @@ -96,5 +99,8 @@ rm %{buildroot}%{_bindir}/yuv-distortion %{_bindir}/libde265-sherlock265 %changelog +* Tue Jul 19 2016 Joachim Bauch 1.0.2-2 +- Fixed compatibility when compiling against FFmpeg 2.9 and newer. + * Thu Jun 09 2016 Joachim Bauch 1.0.2-1 - Initial version.