]>
Commit | Line | Data |
---|---|---|
1 | --- xpra-0.17.5/xpra/codecs/dec_avcodec2/decoder.pyx~ 2016-05-26 17:47:10.000000000 +0200 | |
2 | +++ xpra-0.17.5/xpra/codecs/dec_avcodec2/decoder.pyx 2018-04-29 19:24:10.048722014 +0200 | |
3 | @@ -65,7 +65,7 @@ | |
4 | AVPixelFormat AV_PIX_FMT_GBRP | |
5 | ||
6 | cdef extern from "libavcodec/avcodec.h": | |
7 | - int CODEC_FLAG2_FAST | |
8 | + int AV_CODEC_FLAG2_FAST | |
9 | ||
10 | ctypedef struct AVFrame: | |
11 | uint8_t **data | |
12 | @@ -361,7 +361,7 @@ | |
13 | self.codec_ctx.thread_safe_callbacks = 1 | |
14 | self.codec_ctx.thread_type = 2 #FF_THREAD_SLICE: allow more than one thread per frame | |
15 | self.codec_ctx.thread_count = 0 #auto | |
16 | - self.codec_ctx.flags2 |= CODEC_FLAG2_FAST #may cause "no deblock across slices" - which should be fine | |
17 | + self.codec_ctx.flags2 |= AV_CODEC_FLAG2_FAST #may cause "no deblock across slices" - which should be fine | |
18 | r = avcodec_open2(self.codec_ctx, self.codec, NULL) | |
19 | if r<0: | |
20 | log.error("could not open codec: %s", self.av_error_str(r)) |