# HG changeset patch # User rtognimp # Date 1069880235 0 # Node ID 5cb0e4cdb864835f94995034195a4f9287589d4b # Parent 4b01f2d7a90c894e060d244d50dadd5f9cc67ac1 - Add reget_buffer() function to AVCodecContext - Add default reget_buffer implementation in libavcodec/utils.c - Remove AVCodecContext.cr_available, no longer needed - Remove CODEC_CAP_CR, no longer used - Add img_copy() prototype to avcodec.h (function from imgconvert.c) - Rename img_copy() to jpeg_img_copy() in libavformat/jpeg.c to avoid conflict - Updated msrle, msvideo1, rpza, smc to use reget_buffer diff -r 4b01f2d7a90c -r 5cb0e4cdb864 jpeg.c --- a/jpeg.c Mon Nov 24 17:59:56 2003 +0000 +++ b/jpeg.c Wed Nov 26 20:57:15 2003 +0000 @@ -68,7 +68,7 @@ } } -static void img_copy(uint8_t *dst, int dst_wrap, +static void jpeg_img_copy(uint8_t *dst, int dst_wrap, uint8_t *src, int src_wrap, int width, int height) { @@ -147,7 +147,7 @@ break; } } - img_copy(picture->data[i], picture->linesize[i], + jpeg_img_copy(picture->data[i], picture->linesize[i], picture1.data[i], picture1.linesize[i], w, h); }