diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-06-17 12:26:57 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-06-17 12:27:21 +0000 |
| commit | 075593cfef8e4df6056ea7de388137a68335ea69 (patch) | |
| tree | 006225d54f8682d6022ba16d8a46f18d75fe21a3 /testing/libde265/use-new-ffmpeg-enum-names.patch | |
| parent | 2c92fcc6456e2ff100ee231964871dfbe6bdd961 (diff) | |
| download | aports-075593cfef8e4df6056ea7de388137a68335ea69.tar.bz2 aports-075593cfef8e4df6056ea7de388137a68335ea69.tar.xz | |
main/libde265: move from testing
needed by imagemagick
fixes #9851
Diffstat (limited to 'testing/libde265/use-new-ffmpeg-enum-names.patch')
| -rw-r--r-- | testing/libde265/use-new-ffmpeg-enum-names.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/testing/libde265/use-new-ffmpeg-enum-names.patch b/testing/libde265/use-new-ffmpeg-enum-names.patch deleted file mode 100644 index 3a2facc440..0000000000 --- a/testing/libde265/use-new-ffmpeg-enum-names.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e5b8e2e703d608777afadc54955bd396e4211da0 Mon Sep 17 00:00:00 2001 -From: Dirk Farin <farin@struktur.de> -Date: Thu, 19 Apr 2018 13:15:18 +0200 -Subject: [PATCH] use new FFMPEG enum names - -Patch-Source: https://build.opensuse.org/package/view_file/home:jirutka/libde265/libde265-use_new_FFMPEG_enum_names.patch ---- - sherlock265/VideoDecoder.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sherlock265/VideoDecoder.cc b/sherlock265/VideoDecoder.cc -index 119f6152..b829e1c7 100644 ---- a/sherlock265/VideoDecoder.cc -+++ b/sherlock265/VideoDecoder.cc -@@ -237,7 +237,7 @@ void VideoDecoder::convert_frame_swscale(const de265_image* img, QImage & qimg) - } - 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]; - - |