From e16f217ceb95395669abe3cea18737e92fb78c82 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Tue, 7 Sep 2010 19:15:29 +0000 Subject: Use new imgutils.h API names, fix deprecation warnings. Originally committed as revision 25058 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavdevice/avdevice.h | 2 +- libavdevice/v4l.c | 2 +- libavdevice/v4l2.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'libavdevice') diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index 09f366eead..9508f2277f 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -23,7 +23,7 @@ #define LIBAVDEVICE_VERSION_MAJOR 52 #define LIBAVDEVICE_VERSION_MINOR 2 -#define LIBAVDEVICE_VERSION_MICRO 1 +#define LIBAVDEVICE_VERSION_MICRO 2 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ LIBAVDEVICE_VERSION_MINOR, \ diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c index 50a113a72a..f640c769cd 100644 --- a/libavdevice/v4l.c +++ b/libavdevice/v4l.c @@ -117,7 +117,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) } } - if(av_check_image_size(s->video_win.width, s->video_win.height, 0, s1) < 0) + if(av_image_check_size(s->video_win.width, s->video_win.height, 0, s1) < 0) return -1; desired_palette = -1; diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 0480d6886a..b8adf554a3 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -629,7 +629,7 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap) return AVERROR(EIO); } - if (av_check_image_size(s->width, s->height, 0, s1) < 0) + if (av_image_check_size(s->width, s->height, 0, s1) < 0) return AVERROR(EINVAL); s->frame_format = desired_format; -- cgit v1.2.3