Mercurial > libavcodec.hg

changeset 12462:ffb3668ff7af libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use new imgutils.h API names, fix deprecation warnings.
author stefano
date Tue, 07 Sep 2010 19:15:29 +0000
parents 25174028da0a
children 04e68eb1aab7
files avcodec.h bink.c dirac.c dnxhddec.c dpx.c eacmv.c eamad.c eatgv.c flvdec.c gifdec.c h264_ps.c iff.c imgconvert.c indeo3.c kgv1dec.c libdiracdec.c libopenjpeg.c libschroedingerdec.c libvpxdec.c mjpegdec.c mpegvideo.c nuv.c pcx.c pgssubdec.c pictordec.c pngdec.c pnm.c ptx.c qtrleenc.c rv10.c rv40.c sgidec.c sunrast.c targa.c tiff.c txd.c utils.c vp3.c vp8.c vqavideo.c xsubdec.c yop.c
diffstat 42 files changed, 55 insertions(+), 55 deletions(-) [+]
line wrap: on
line diff
--- a/avcodec.h	Mon Sep 06 19:26:18 2010 +0000
+++ b/avcodec.h	Tue Sep 07 19:15:29 2010 +0000
@@ -32,7 +32,7 @@
 
 #define LIBAVCODEC_VERSION_MAJOR 52
 #define LIBAVCODEC_VERSION_MINOR 87
-#define LIBAVCODEC_VERSION_MICRO  1
+#define LIBAVCODEC_VERSION_MICRO  2
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \
--- a/bink.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/bink.c	Tue Sep 07 19:15:29 2010 +0000
@@ -972,7 +972,7 @@
 
     c->pic.data[0] = NULL;
 
-    if (av_check_image_size(avctx->width, avctx->height, 0, avctx) < 0) {
+    if (av_image_check_size(avctx->width, avctx->height, 0, avctx) < 0) {
         return 1;
     }
 
--- a/dirac.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/dirac.c	Tue Sep 07 19:15:29 2010 +0000
@@ -269,7 +269,7 @@
     if (parse_source_parameters(avctx, gb, source))
         return -1;
 
-    if (av_check_image_size(source->width, source->height, 0, avctx))
+    if (av_image_check_size(source->width, source->height, 0, avctx))
         return -1;
 
     avcodec_set_dimensions(avctx, source->width, source->height);
--- a/dnxhddec.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/dnxhddec.c	Tue Sep 07 19:15:29 2010 +0000
@@ -306,7 +306,7 @@
     }
 
     avctx->pix_fmt = PIX_FMT_YUV422P;
-    if (av_check_image_size(ctx->width, ctx->height, 0, avctx))
+    if (av_image_check_size(ctx->width, ctx->height, 0, avctx))
         return -1;
     avcodec_set_dimensions(avctx, ctx->width, ctx->height);
 
--- a/dpx.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/dpx.c	Tue Sep 07 19:15:29 2010 +0000
@@ -140,7 +140,7 @@
 
     if (s->picture.data[0])
         avctx->release_buffer(avctx, &s->picture);
-    if (av_check_image_size(w, h, 0, avctx))
+    if (av_image_check_size(w, h, 0, avctx))
         return -1;
     if (w != avctx->width || h != avctx->height)
         avcodec_set_dimensions(avctx, w, h);
--- a/eacmv.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/eacmv.c	Tue Sep 07 19:15:29 2010 +0000
@@ -157,7 +157,7 @@
         return buf_size;
     }
 
-    if (av_check_image_size(s->width, s->height, 0, s->avctx))
+    if (av_image_check_size(s->width, s->height, 0, s->avctx))
         return -1;
 
     /* shuffle */
--- a/eamad.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/eamad.c	Tue Sep 07 19:15:29 2010 +0000
@@ -261,7 +261,7 @@
     buf += 16;
 
     if (avctx->width != s->width || avctx->height != s->height) {
-        if (av_check_image_size(s->width, s->height, 0, avctx) < 0)
+        if (av_image_check_size(s->width, s->height, 0, avctx) < 0)
             return -1;
         avcodec_set_dimensions(avctx, s->width, s->height);
         if (t->frame.data[0])
--- a/eatgv.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/eatgv.c	Tue Sep 07 19:15:29 2010 +0000
@@ -276,7 +276,7 @@
         }
     }
 
-    if (av_check_image_size(s->width, s->height, 0, avctx))
+    if (av_image_check_size(s->width, s->height, 0, avctx))
         return -1;
 
     /* shuffle */
--- a/flvdec.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/flvdec.c	Tue Sep 07 19:15:29 2010 +0000
@@ -83,7 +83,7 @@
         width = height = 0;
         break;
     }
-    if(av_check_image_size(width, height, 0, s->avctx))
+    if(av_image_check_size(width, height, 0, s->avctx))
         return -1;
     s->width = width;
     s->height = height;
--- a/gifdec.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/gifdec.c	Tue Sep 07 19:15:29 2010 +0000
@@ -297,7 +297,7 @@
         return -1;
 
     avctx->pix_fmt = PIX_FMT_PAL8;
-    if (av_check_image_size(s->screen_width, s->screen_height, 0, avctx))
+    if (av_image_check_size(s->screen_width, s->screen_height, 0, avctx))
         return -1;
     avcodec_set_dimensions(avctx, s->screen_width, s->screen_height);
 
--- a/h264_ps.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/h264_ps.c	Tue Sep 07 19:15:29 2010 +0000
@@ -342,7 +342,7 @@
     sps->mb_width = get_ue_golomb(&s->gb) + 1;
     sps->mb_height= get_ue_golomb(&s->gb) + 1;
     if((unsigned)sps->mb_width >= INT_MAX/16 || (unsigned)sps->mb_height >= INT_MAX/16 ||
-       av_check_image_size(16*sps->mb_width, 16*sps->mb_height, 0, h->s.avctx)){
+       av_image_check_size(16*sps->mb_width, 16*sps->mb_height, 0, h->s.avctx)){
         av_log(h->s.avctx, AV_LOG_ERROR, "mb_width/height overflow\n");
         goto fail;
     }
--- a/iff.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/iff.c	Tue Sep 07 19:15:29 2010 +0000
@@ -161,7 +161,7 @@
         return AVERROR_INVALIDDATA;
     }
 
-    if ((err = av_check_image_size(avctx->width, avctx->height, 0, avctx)))
+    if ((err = av_image_check_size(avctx->width, avctx->height, 0, avctx)))
         return err;
     s->planesize = FFALIGN(avctx->width, 16) >> 3; // Align plane size in bits to word-boundary
     s->planebuf = av_malloc(s->planesize + FF_INPUT_BUFFER_PADDING_SIZE);
--- a/imgconvert.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/imgconvert.c	Tue Sep 07 19:15:29 2010 +0000
@@ -501,13 +501,13 @@
 #if LIBAVCODEC_VERSION_MAJOR < 53
 int ff_fill_linesize(AVPicture *picture, enum PixelFormat pix_fmt, int width)
 {
-    return av_fill_image_linesizes(picture->linesize, pix_fmt, width);
+    return av_image_fill_linesizes(picture->linesize, pix_fmt, width);
 }
 
 int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, enum PixelFormat pix_fmt,
                     int height)
 {
-    return av_fill_image_pointers(picture->data, pix_fmt, height, ptr, picture->linesize);
+    return av_image_fill_pointers(picture->data, pix_fmt, height, ptr, picture->linesize);
 }
 #endif
 
@@ -515,13 +515,13 @@
                    enum PixelFormat pix_fmt, int width, int height)
 {
 
-    if(av_check_image_size(width, height, 0, NULL))
+    if(av_image_check_size(width, height, 0, NULL))
         return -1;
 
-    if (av_fill_image_linesizes(picture->linesize, pix_fmt, width))
+    if (av_image_fill_linesizes(picture->linesize, pix_fmt, width))
         return -1;
 
-    return av_fill_image_pointers(picture->data, pix_fmt, height, ptr, picture->linesize);
+    return av_image_fill_pointers(picture->data, pix_fmt, height, ptr, picture->linesize);
 }
 
 int avpicture_layout(const AVPicture* src, enum PixelFormat pix_fmt, int width, int height,
@@ -597,7 +597,7 @@
 int avpicture_get_size(enum PixelFormat pix_fmt, int width, int height)
 {
     AVPicture dummy_pict;
-    if(av_check_image_size(width, height, 0, NULL))
+    if(av_image_check_size(width, height, 0, NULL))
         return -1;
     switch (pix_fmt) {
     case PIX_FMT_RGB8:
@@ -797,7 +797,7 @@
 #if LIBAVCODEC_VERSION_MAJOR < 53
 int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane)
 {
-    return av_get_image_linesize(pix_fmt, width, plane);
+    return av_image_get_linesize(pix_fmt, width, plane);
 }
 #endif
 
@@ -814,7 +814,7 @@
     case FF_PIXEL_PLANAR:
         for(i = 0; i < pf->nb_channels; i++) {
             int h;
-            int bwidth = av_get_image_linesize(pix_fmt, width, i);
+            int bwidth = av_image_get_linesize(pix_fmt, width, i);
             h = height;
             if (i == 1 || i == 2) {
                 h= -((-height)>>desc->log2_chroma_h);
--- a/indeo3.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/indeo3.c	Tue Sep 07 19:15:29 2010 +0000
@@ -996,7 +996,7 @@
     image_height = bytestream_get_le16(&buf_pos);
     image_width  = bytestream_get_le16(&buf_pos);
 
-    if(av_check_image_size(image_width, image_height, 0, avctx))
+    if(av_image_check_size(image_width, image_height, 0, avctx))
         return -1;
     if (image_width != avctx->width || image_height != avctx->height) {
         int ret;
--- a/kgv1dec.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/kgv1dec.c	Tue Sep 07 19:15:29 2010 +0000
@@ -51,7 +51,7 @@
     h = (buf[1] + 1) * 8;
     buf += 2;
 
-    if (av_check_image_size(w, h, 0, avctx))
+    if (av_image_check_size(w, h, 0, avctx))
         return -1;
 
     if (w != avctx->width || h != avctx->height)
--- a/libdiracdec.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/libdiracdec.c	Tue Sep 07 19:15:29 2010 +0000
@@ -106,7 +106,7 @@
             /* tell FFmpeg about sequence details */
             dirac_sourceparams_t *src_params = &p_dirac_params->p_decoder->src_params;
 
-            if (av_check_image_size(src_params->width, src_params->height,
+            if (av_image_check_size(src_params->width, src_params->height,
                                     0, avccontext) < 0) {
                 av_log(avccontext, AV_LOG_ERROR, "Invalid dimensions (%dx%d)\n",
                        src_params->width, src_params->height);
--- a/libopenjpeg.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/libopenjpeg.c	Tue Sep 07 19:15:29 2010 +0000
@@ -114,7 +114,7 @@
     }
     width  = image->comps[0].w << avctx->lowres;
     height = image->comps[0].h << avctx->lowres;
-    if(av_check_image_size(width, height, 0, avctx) < 0) {
+    if(av_image_check_size(width, height, 0, avctx) < 0) {
         av_log(avctx, AV_LOG_ERROR, "%dx%d dimension invalid.\n", width, height);
         goto done;
     }
--- a/libschroedingerdec.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/libschroedingerdec.c	Tue Sep 07 19:15:29 2010 +0000
@@ -170,7 +170,7 @@
     p_schro_params->format = schro_decoder_get_video_format(decoder);
 
     /* Tell FFmpeg about sequence details. */
-    if (av_check_image_size(p_schro_params->format->width, p_schro_params->format->height,
+    if (av_image_check_size(p_schro_params->format->width, p_schro_params->format->height,
                             0, avccontext) < 0) {
         av_log(avccontext, AV_LOG_ERROR, "invalid dimensions (%dx%d)\n",
                p_schro_params->format->width, p_schro_params->format->height);
--- a/libvpxdec.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/libvpxdec.c	Tue Sep 07 19:15:29 2010 +0000
@@ -87,7 +87,7 @@
         if ((int) img->d_w != avctx->width || (int) img->d_h != avctx->height) {
             av_log(avctx, AV_LOG_INFO, "dimension change! %dx%d -> %dx%d\n",
                    avctx->width, avctx->height, img->d_w, img->d_h);
-            if (av_check_image_size(img->d_w, img->d_h, 0, avctx))
+            if (av_image_check_size(img->d_w, img->d_h, 0, avctx))
                 return AVERROR_INVALIDDATA;
             avcodec_set_dimensions(avctx, img->d_w, img->d_h);
         }
--- a/mjpegdec.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/mjpegdec.c	Tue Sep 07 19:15:29 2010 +0000
@@ -219,7 +219,7 @@
         height= s->height;
 
     av_log(s->avctx, AV_LOG_DEBUG, "sof0: picture: %dx%d\n", width, height);
-    if(av_check_image_size(width, height, 0, s->avctx))
+    if(av_image_check_size(width, height, 0, s->avctx))
         return -1;
 
     nb_components = get_bits(&s->gb, 8);
--- a/mpegvideo.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/mpegvideo.c	Tue Sep 07 19:15:29 2010 +0000
@@ -511,7 +511,7 @@
         return -1;
     }
 
-    if((s->width || s->height) && av_check_image_size(s->width, s->height, 0, s->avctx))
+    if((s->width || s->height) && av_image_check_size(s->width, s->height, 0, s->avctx))
         return -1;
 
     dsputil_init(&s->dsp, s->avctx);
--- a/nuv.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/nuv.c	Tue Sep 07 19:15:29 2010 +0000
@@ -112,7 +112,7 @@
     if (quality >= 0)
         get_quant_quality(c, quality);
     if (width != c->width || height != c->height) {
-        if (av_check_image_size(height, width, 0, avctx) < 0)
+        if (av_image_check_size(height, width, 0, avctx) < 0)
             return 0;
         avctx->width = c->width = width;
         avctx->height = c->height = height;
--- a/pcx.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/pcx.c	Tue Sep 07 19:15:29 2010 +0000
@@ -143,7 +143,7 @@
     if (p->data[0])
         avctx->release_buffer(avctx, p);
 
-    if (av_check_image_size(w, h, 0, avctx))
+    if (av_image_check_size(w, h, 0, avctx))
         return -1;
     if (w != avctx->width || h != avctx->height)
         avcodec_set_dimensions(avctx, w, h);
--- a/pgssubdec.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/pgssubdec.c	Tue Sep 07 19:15:29 2010 +0000
@@ -270,7 +270,7 @@
 
     dprintf(avctx, "Video Dimensions %dx%d\n",
             w, h);
-    if (av_check_image_size(w, h, 0, avctx) >= 0)
+    if (av_image_check_size(w, h, 0, avctx) >= 0)
         avcodec_set_dimensions(avctx, w, h);
 
     /* Skip 1 bytes of unknown, frame rate? */
--- a/pictordec.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/pictordec.c	Tue Sep 07 19:15:29 2010 +0000
@@ -136,7 +136,7 @@
     avctx->pix_fmt = PIX_FMT_PAL8;
 
     if (s->width != avctx->width && s->height != avctx->height) {
-        if (av_check_image_size(s->width, s->height, 0, avctx) < 0)
+        if (av_image_check_size(s->width, s->height, 0, avctx) < 0)
             return -1;
         avcodec_set_dimensions(avctx, s->width, s->height);
         if (s->frame.data[0])
--- a/pngdec.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/pngdec.c	Tue Sep 07 19:15:29 2010 +0000
@@ -442,7 +442,7 @@
                 goto fail;
             s->width = bytestream_get_be32(&s->bytestream);
             s->height = bytestream_get_be32(&s->bytestream);
-            if(av_check_image_size(s->width, s->height, 0, avctx)){
+            if(av_image_check_size(s->width, s->height, 0, avctx)){
                 s->width= s->height= 0;
                 goto fail;
             }
--- a/pnm.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/pnm.c	Tue Sep 07 19:15:29 2010 +0000
@@ -102,7 +102,7 @@
             }
         }
         /* check that all tags are present */
-        if (w <= 0 || h <= 0 || maxval <= 0 || depth <= 0 || tuple_type[0] == '\0' || av_check_image_size(w, h, 0, avctx))
+        if (w <= 0 || h <= 0 || maxval <= 0 || depth <= 0 || tuple_type[0] == '\0' || av_image_check_size(w, h, 0, avctx))
             return -1;
 
         avctx->width  = w;
@@ -135,7 +135,7 @@
         return -1;
     pnm_get(s, buf1, sizeof(buf1));
     avctx->height = atoi(buf1);
-    if(av_check_image_size(avctx->width, avctx->height, 0, avctx))
+    if(av_image_check_size(avctx->width, avctx->height, 0, avctx))
         return -1;
     if (avctx->pix_fmt != PIX_FMT_MONOWHITE) {
         pnm_get(s, buf1, sizeof(buf1));
--- a/ptx.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/ptx.c	Tue Sep 07 19:15:29 2010 +0000
@@ -65,7 +65,7 @@
     if (p->data[0])
         avctx->release_buffer(avctx, p);
 
-    if (av_check_image_size(w, h, 0, avctx))
+    if (av_image_check_size(w, h, 0, avctx))
         return -1;
     if (w != avctx->width || h != avctx->height)
         avcodec_set_dimensions(avctx, w, h);
--- a/qtrleenc.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/qtrleenc.c	Tue Sep 07 19:15:29 2010 +0000
@@ -63,7 +63,7 @@
 {
     QtrleEncContext *s = avctx->priv_data;
 
-    if (av_check_image_size(avctx->width, avctx->height, 0, avctx) < 0) {
+    if (av_image_check_size(avctx->width, avctx->height, 0, avctx) < 0) {
         return -1;
     }
     s->avctx=avctx;
--- a/rv10.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/rv10.c	Tue Sep 07 19:15:29 2010 +0000
@@ -370,7 +370,7 @@
         }
         if(new_w != s->width || new_h != s->height){
             av_log(s->avctx, AV_LOG_DEBUG, "attempting to change resolution to %dx%d\n", new_w, new_h);
-            if (av_check_image_size(new_w, new_h, 0, s->avctx) < 0)
+            if (av_image_check_size(new_w, new_h, 0, s->avctx) < 0)
                 return -1;
             MPV_common_end(s);
             avcodec_set_dimensions(s->avctx, new_w, new_h);
--- a/rv40.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/rv40.c	Tue Sep 07 19:15:29 2010 +0000
@@ -144,7 +144,7 @@
     si->pts = get_bits(gb, 13);
     if(!si->type || !get_bits1(gb))
         rv40_parse_picture_size(gb, &w, &h);
-    if(av_check_image_size(w, h, 0, r->s.avctx) < 0)
+    if(av_image_check_size(w, h, 0, r->s.avctx) < 0)
         return -1;
     si->width  = w;
     si->height = h;
--- a/sgidec.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/sgidec.c	Tue Sep 07 19:15:29 2010 +0000
@@ -202,7 +202,7 @@
         return -1;
     }
 
-    if (av_check_image_size(s->width, s->height, 0, avctx))
+    if (av_image_check_size(s->width, s->height, 0, avctx))
         return -1;
     avcodec_set_dimensions(avctx, s->width, s->height);
 
--- a/sunrast.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/sunrast.c	Tue Sep 07 19:15:29 2010 +0000
@@ -98,7 +98,7 @@
     if (p->data[0])
         avctx->release_buffer(avctx, p);
 
-    if (av_check_image_size(w, h, 0, avctx))
+    if (av_image_check_size(w, h, 0, avctx))
         return -1;
     if (w != avctx->width || h != avctx->height)
         avcodec_set_dimensions(avctx, w, h);
--- a/targa.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/targa.c	Tue Sep 07 19:15:29 2010 +0000
@@ -146,7 +146,7 @@
     if(s->picture.data[0])
         avctx->release_buffer(avctx, &s->picture);
 
-    if(av_check_image_size(w, h, 0, avctx))
+    if(av_image_check_size(w, h, 0, avctx))
         return -1;
     if(w != avctx->width || h != avctx->height)
         avcodec_set_dimensions(avctx, w, h);
--- a/tiff.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/tiff.c	Tue Sep 07 19:15:29 2010 +0000
@@ -306,7 +306,7 @@
             return -1;
         }
         if(s->width != s->avctx->width || s->height != s->avctx->height){
-            if(av_check_image_size(s->width, s->height, 0, s->avctx))
+            if(av_image_check_size(s->width, s->height, 0, s->avctx))
                 return -1;
             avcodec_set_dimensions(s->avctx, s->width, s->height);
         }
@@ -508,7 +508,7 @@
         s->bpp = 1;
         avctx->pix_fmt = PIX_FMT_MONOBLACK;
         if(s->width != s->avctx->width || s->height != s->avctx->height){
-            if(av_check_image_size(s->width, s->height, 0, s->avctx))
+            if(av_image_check_size(s->width, s->height, 0, s->avctx))
                 return -1;
             avcodec_set_dimensions(s->avctx, s->width, s->height);
         }
--- a/txd.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/txd.c	Tue Sep 07 19:15:29 2010 +0000
@@ -80,7 +80,7 @@
     if (p->data[0])
         avctx->release_buffer(avctx, p);
 
-    if (av_check_image_size(w, h, 0, avctx))
+    if (av_image_check_size(w, h, 0, avctx))
         return -1;
     if (w != avctx->width || h != avctx->height)
         avcodec_set_dimensions(avctx, w, h);
--- a/utils.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/utils.c	Tue Sep 07 19:15:29 2010 +0000
@@ -215,7 +215,7 @@
 
 #if LIBAVCODEC_VERSION_MAJOR < 53
 int avcodec_check_dimensions(void *av_log_ctx, unsigned int w, unsigned int h){
-    return av_check_image_size(w, h, 0, av_log_ctx);
+    return av_image_check_size(w, h, 0, av_log_ctx);
 }
 #endif
 
@@ -235,7 +235,7 @@
         return -1;
     }
 
-    if(av_check_image_size(w, h, 0, s))
+    if(av_image_check_size(w, h, 0, s))
         return -1;
 
     if(s->internal_buffer==NULL){
@@ -487,7 +487,7 @@
 
 #define SANE_NB_CHANNELS 128U
     if (((avctx->coded_width || avctx->coded_height)
-        && av_check_image_size(avctx->coded_width, avctx->coded_height, 0, avctx))
+        && av_image_check_size(avctx->coded_width, avctx->coded_height, 0, avctx))
         || avctx->channels > SANE_NB_CHANNELS) {
         ret = AVERROR(EINVAL);
         goto free_and_end;
@@ -554,7 +554,7 @@
         av_log(avctx, AV_LOG_ERROR, "buffer smaller than minimum size\n");
         return -1;
     }
-    if(av_check_image_size(avctx->width, avctx->height, 0, avctx))
+    if(av_image_check_size(avctx->width, avctx->height, 0, avctx))
         return -1;
     if((avctx->codec->capabilities & CODEC_CAP_DELAY) || pict){
         int ret = avctx->codec->encode(avctx, buf, buf_size, pict);
@@ -604,7 +604,7 @@
     int ret;
 
     *got_picture_ptr= 0;
-    if((avctx->coded_width||avctx->coded_height) && av_check_image_size(avctx->coded_width, avctx->coded_height, 0, avctx))
+    if((avctx->coded_width||avctx->coded_height) && av_image_check_size(avctx->coded_width, avctx->coded_height, 0, avctx))
         return -1;
     if((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size){
         ret = avctx->codec->decode(avctx, picture, got_picture_ptr,
--- a/vp3.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/vp3.c	Tue Sep 07 19:15:29 2010 +0000
@@ -1981,7 +1981,7 @@
     visible_width  = s->width  = get_bits(gb, 16) << 4;
     visible_height = s->height = get_bits(gb, 16) << 4;
 
-    if(av_check_image_size(s->width, s->height, 0, avctx)){
+    if(av_image_check_size(s->width, s->height, 0, avctx)){
         av_log(avctx, AV_LOG_ERROR, "Invalid dimensions (%dx%d)\n", s->width, s->height);
         s->width= s->height= 0;
         return -1;
--- a/vp8.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/vp8.c	Tue Sep 07 19:15:29 2010 +0000
@@ -223,7 +223,7 @@
 
 static int update_dimensions(VP8Context *s, int width, int height)
 {
-    if (av_check_image_size(width, height, 0, s->avctx))
+    if (av_image_check_size(width, height, 0, s->avctx))
         return AVERROR_INVALIDDATA;
 
     vp8_decode_flush(s->avctx);
--- a/vqavideo.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/vqavideo.c	Tue Sep 07 19:15:29 2010 +0000
@@ -148,7 +148,7 @@
     s->vqa_version = vqa_header[0];
     s->width = AV_RL16(&vqa_header[6]);
     s->height = AV_RL16(&vqa_header[8]);
-    if(av_check_image_size(s->width, s->height, 0, avctx)){
+    if(av_image_check_size(s->width, s->height, 0, avctx)){
         s->width= s->height= 0;
         return -1;
     }
--- a/xsubdec.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/xsubdec.c	Tue Sep 07 19:15:29 2010 +0000
@@ -77,7 +77,7 @@
     // read header
     w = bytestream_get_le16(&buf);
     h = bytestream_get_le16(&buf);
-    if (av_check_image_size(w, h, 0, avctx) < 0)
+    if (av_image_check_size(w, h, 0, avctx) < 0)
         return -1;
     x = bytestream_get_le16(&buf);
     y = bytestream_get_le16(&buf);
--- a/yop.c	Mon Sep 06 19:26:18 2010 +0000
+++ b/yop.c	Tue Sep 07 19:15:29 2010 +0000
@@ -85,7 +85,7 @@
     s->avctx = avctx;
 
     if (avctx->width & 1 || avctx->height & 1 ||
-        av_check_image_size(avctx->width, avctx->height, 0, avctx) < 0) {
+        av_image_check_size(avctx->width, avctx->height, 0, avctx) < 0) {
         av_log(avctx, AV_LOG_ERROR, "YOP has invalid dimensions\n");
         return -1;
     }