Control: tags -1 fixed-upstream patch

On Wed, 24 Jan 2018 22:26:51 +0000 jcowg...@debian.org wrote:
> Source: xpra
> Version: 0.17.6+dfsg-1
> Severity: important
> User: debian-multime...@lists.debian.org
> Usertags: ffmpeg-3.5-transition
> 
> Hi,
> 
> Your package FTBFS with the upcoming version 3.5 of FFmpeg.

This has been fixed upstream in 2.2.4.

I have also attached the relevant patch which applies on top of
0.17.6+dfsg-1 if you don't have time to get 2.2.4 into unstable (I
notice 2.x is only in experimental).

James
Description: Fix FTBFS with FFmpeg 4.0
Origin: upstream, commit:r18086
Bug-Debian: https://bugs.debian.org/888333
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/xpra/codecs/dec_avcodec2/decoder.pyx
+++ b/xpra/codecs/dec_avcodec2/decoder.pyx
@@ -65,7 +65,7 @@ cdef extern from "libavutil/pixfmt.h":
     AVPixelFormat AV_PIX_FMT_GBRP
 
 cdef extern from "libavcodec/avcodec.h":
-    int CODEC_FLAG2_FAST
+    int AV_CODEC_FLAG2_FAST
 
     ctypedef struct AVFrame:
         uint8_t **data
@@ -361,7 +361,7 @@ cdef class Decoder:
         self.codec_ctx.thread_safe_callbacks = 1
         self.codec_ctx.thread_type = 2      #FF_THREAD_SLICE: allow more than one thread per frame
         self.codec_ctx.thread_count = 0     #auto
-        self.codec_ctx.flags2 |= CODEC_FLAG2_FAST   #may cause "no deblock across slices" - which should be fine
+        self.codec_ctx.flags2 |= AV_CODEC_FLAG2_FAST   #may cause "no deblock across slices" - which should be fine
         r = avcodec_open2(self.codec_ctx, self.codec, NULL)
         if r<0:
             log.error("could not open codec: %s", self.av_error_str(r))

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to