summaryrefslogtreecommitdiff
path: root/libavdevice/v4l.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavdevice/v4l.c')
-rw-r--r--libavdevice/v4l.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c
index 39844a913c..c2c67d0516 100644
--- a/libavdevice/v4l.c
+++ b/libavdevice/v4l.c
@@ -84,11 +84,6 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
}
s->time_base = ap->time_base;
- if((unsigned)ap->width > 32767 || (unsigned)ap->height > 32767) {
- av_log(s1, AV_LOG_ERROR, "Capture size is out of range: %dx%d\n",
- ap->width, ap->height);
- return -1;
- }
s->video_win.width = ap->width;
s->video_win.height = ap->height;
@@ -121,6 +116,9 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
}
}
+ if(avcodec_check_dimensions(s1, s->video_win.width, s->video_win.height) < 0)
+ return -1;
+
desired_palette = -1;
desired_depth = -1;
for (j = 0; j < vformat_num; j++) {