diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2011-07-13 11:05:02 +0200 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2011-07-22 16:53:56 +0200 |
| commit | 47684d2885caf43fcc2aa6ac51c07e6876b12db3 (patch) | |
| tree | 60b526f5d1e7e9e5bd301e560de5d2a820738565 | |
| parent | c12bafbc5326babf3cbab96d6d1537075c49c927 (diff) | |
| download | spice-47684d2885caf43fcc2aa6ac51c07e6876b12db3.tar.gz spice-47684d2885caf43fcc2aa6ac51c07e6876b12db3.tar.xz spice-47684d2885caf43fcc2aa6ac51c07e6876b12db3.zip | |
mjpeg: rename jpeg_mem_dest
jpeg_mem_dest is a public symbol in libjpeg8 so using it with
no prefix will cause symbol clashes. Rename it to spice_jpeg_mem_dest.
| -rw-r--r-- | server/mjpeg_encoder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/mjpeg_encoder.c b/server/mjpeg_encoder.c index ed242db3..ea2e15fe 100644 --- a/server/mjpeg_encoder.c +++ b/server/mjpeg_encoder.c @@ -163,8 +163,8 @@ static void term_mem_destination(j_compress_ptr cinfo) */ static void -jpeg_mem_dest (j_compress_ptr cinfo, - unsigned char ** outbuffer, unsigned long * outsize) +spice_jpeg_mem_dest(j_compress_ptr cinfo, + unsigned char ** outbuffer, unsigned long * outsize) { mem_destination_mgr *dest; #define OUTPUT_BUF_SIZE 4096 /* choose an efficiently fwrite'able size */ @@ -241,7 +241,7 @@ int mjpeg_encoder_start_frame(MJpegEncoder *encoder, SpiceBitmapFmt format, encoder->row = spice_malloc(stride); } - jpeg_mem_dest(&encoder->cinfo, dest, dest_len); + spice_jpeg_mem_dest(&encoder->cinfo, dest, dest_len); encoder->cinfo.image_width = encoder->width; encoder->cinfo.image_height = encoder->height; |