diff options
author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-09-07 23:15:29 +0400 |
---|---|---|
committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-09-07 23:15:29 +0400 |
commit | e16f217ceb95395669abe3cea18737e92fb78c82 (patch) | |
tree | 8e55022c675d84e0cf39ebb7047396992dd93e7d /libavfilter | |
parent | 9b7269e379289e240404c803acac25c607bb0e26 (diff) |
Use new imgutils.h API names, fix deprecation warnings.
Originally committed as revision 25058 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/avfilter.c | 2 | ||||
-rw-r--r-- | libavfilter/avfilter.h | 2 | ||||
-rw-r--r-- | libavfilter/defaults.c | 6 | ||||
-rw-r--r-- | libavfilter/vf_crop.c | 2 | ||||
-rw-r--r-- | libavfilter/vf_hflip.c | 2 | ||||
-rw-r--r-- | libavfilter/vf_pad.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index bc8c67e523..221dfaa9e0 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -381,7 +381,7 @@ void avfilter_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) for (i = 0; i < 4; i++) { int planew = - av_get_image_linesize(link->format, link->cur_buf->video->w, i); + av_image_get_linesize(link->format, link->cur_buf->video->w, i); if (!src[i]) continue; diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 721519a200..bd949ad631 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -26,7 +26,7 @@ #define LIBAVFILTER_VERSION_MAJOR 1 #define LIBAVFILTER_VERSION_MINOR 38 -#define LIBAVFILTER_VERSION_MICRO 1 +#define LIBAVFILTER_VERSION_MICRO 2 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c index 19559b1250..7e44901e4a 100644 --- a/libavfilter/defaults.c +++ b/libavfilter/defaults.c @@ -54,17 +54,17 @@ AVFilterBufferRef *avfilter_default_get_video_buffer(AVFilterLink *link, int per pic->refcount = 1; ref->format = link->format; pic->free = avfilter_default_free_buffer; - av_fill_image_linesizes(pic->linesize, ref->format, ref->video->w); + av_image_fill_linesizes(pic->linesize, ref->format, ref->video->w); for (i = 0; i < 4; i++) pic->linesize[i] = FFALIGN(pic->linesize[i], 16); - tempsize = av_fill_image_pointers(pic->data, ref->format, ref->video->h, NULL, pic->linesize); + tempsize = av_image_fill_pointers(pic->data, ref->format, ref->video->h, NULL, pic->linesize); buf = av_malloc(tempsize + 16); // +2 is needed for swscaler, +16 to be // SIMD-friendly if (!buf) goto fail; - av_fill_image_pointers(pic->data, ref->format, ref->video->h, buf, pic->linesize); + av_image_fill_pointers(pic->data, ref->format, ref->video->h, buf, pic->linesize); memcpy(ref->data, pic->data, sizeof(ref->data)); memcpy(ref->linesize, pic->linesize, sizeof(ref->linesize)); diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c index 2ea6f75618..880c9548e1 100644 --- a/libavfilter/vf_crop.c +++ b/libavfilter/vf_crop.c @@ -84,7 +84,7 @@ static int config_input(AVFilterLink *link) CropContext *crop = ctx->priv; const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[link->format]; - av_fill_image_max_pixsteps(crop->max_step, NULL, pix_desc); + av_image_fill_max_pixsteps(crop->max_step, NULL, pix_desc); crop->hsub = av_pix_fmt_descriptors[link->format].log2_chroma_w; crop->vsub = av_pix_fmt_descriptors[link->format].log2_chroma_h; diff --git a/libavfilter/vf_hflip.c b/libavfilter/vf_hflip.c index acdfe8cffd..4deb14a53d 100644 --- a/libavfilter/vf_hflip.c +++ b/libavfilter/vf_hflip.c @@ -70,7 +70,7 @@ static int config_props(AVFilterLink *inlink) FlipContext *flip = inlink->dst->priv; const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[inlink->format]; - av_fill_image_max_pixsteps(flip->max_step, NULL, pix_desc); + av_image_fill_max_pixsteps(flip->max_step, NULL, pix_desc); flip->hsub = av_pix_fmt_descriptors[inlink->format].log2_chroma_w; flip->vsub = av_pix_fmt_descriptors[inlink->format].log2_chroma_h; diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c index 236cecfa94..d79baeab22 100644 --- a/libavfilter/vf_pad.c +++ b/libavfilter/vf_pad.c @@ -407,7 +407,7 @@ static int color_config_props(AVFilterLink *inlink) color->w &= ~((1 << color->hsub) - 1); color->h &= ~((1 << color->vsub) - 1); - if (av_check_image_size(color->w, color->h, 0, ctx) < 0) + if (av_image_check_size(color->w, color->h, 0, ctx) < 0) return AVERROR(EINVAL); memcpy(rgba_color, color->color, sizeof(rgba_color)); |