- 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

Originally committed as revision 2531 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/libavformat/jpeg.c b/libavformat/jpeg.c
index c0b7b3b65e..d922d6c73a 100644
--- a/libavformat/jpeg.c
+++ b/libavformat/jpeg.c
@@ -68,7 +68,7 @@ static int jpeg_get_buffer(AVCodecContext *c, AVFrame *picture)
     }
 }
 
-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 @@ static int jpeg_read(ByteIOContext *f,
                 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);
     }