Skip to content

Commit

Permalink
preserve patch offsets
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@4180 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Aug 19, 2013
1 parent 9f223af commit ae3d169
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/patches/cython-noconst.patch
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ Index: xpra/codecs/dec_avcodec/decoder.pyx
===================================================================
--- a/xpra/codecs/dec_avcodec/decoder.pyx (revision 4178)
+++ b/xpra/codecs/dec_avcodec/decoder.pyx (working copy)
@@ -77,8 +77,8 @@
@@ -78,8 +78,8 @@
#init and free:
void avcodec_register_all()
AVCodec *avcodec_find_decoder(AVCodecID id)
Expand All @@ -137,7 +137,7 @@ Index: xpra/codecs/dec_avcodec/decoder.pyx
AVFrame *avcodec_alloc_frame()
void avcodec_free_frame(AVFrame **frame)
int avcodec_close(AVCodecContext *avctx)
@@ -87,7 +87,7 @@
@@ -88,7 +88,7 @@
void av_init_packet(AVPacket *pkt) nogil
void avcodec_get_frame_defaults(AVFrame *frame) nogil
int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
Expand All @@ -146,7 +146,7 @@ Index: xpra/codecs/dec_avcodec/decoder.pyx

#buffer management:
int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic)
@@ -430,7 +430,7 @@
@@ -431,7 +431,7 @@

def decompress_image(self, input, options):
cdef unsigned char * padded_buf = NULL
Expand All @@ -155,7 +155,7 @@ Index: xpra/codecs/dec_avcodec/decoder.pyx
cdef Py_ssize_t buf_len = 0
cdef int len = 0
cdef int got_picture
@@ -440,7 +440,7 @@
@@ -441,7 +441,7 @@
assert self.codec_ctx!=NULL
assert self.codec!=NULL
#copy input buffer into padded C buffer:
Expand Down
1 change: 1 addition & 0 deletions src/xpra/codecs/dec_avcodec/decoder.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ cdef extern from "Python.h":
object PyBuffer_FromMemory(void *ptr, Py_ssize_t size)
int PyObject_AsReadBuffer(object obj, void ** buffer, Py_ssize_t * buffer_len) except -1


cdef extern from "string.h":
void * memcpy(void * destination, void * source, size_t num) nogil
void * memset(void * ptr, int value, size_t num) nogil
Expand Down

0 comments on commit ae3d169

Please sign in to comment.