- fix building with ffmpeg 4.0

[packages/xpra.git] / ffmpeg4.patch

diff --git a/ffmpeg4.patch b/ffmpeg4.patch
new file mode 100644 (file)
index 0000000..2628051
--- /dev/null
+++ b/ffmpeg4.patch
@@ -0,0 +1,20 @@
+--- xpra-0.17.5/xpra/codecs/dec_avcodec2/decoder.pyx~  2016-05-26 17:47:10.000000000 +0200
++++ xpra-0.17.5/xpra/codecs/dec_avcodec2/decoder.pyx   2018-04-29 19:24:10.048722014 +0200
+@@ -65,7 +65,7 @@
+     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 @@
+         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))