diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-20 13:29:02 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-20 13:29:02 +0000 |
| commit | 2a79f108d65f2dfd4448a04e5a0f44c92167b8b5 (patch) | |
| tree | dc402b502e39c1e03e3e2581786c0d4c9062ed54 /libvo/vosub_vidix.c | |
| parent | 06b36890170eb18031f7b7c5f25ad2dd242702bd (diff) | |
| download | mpv-2a79f108d65f2dfd4448a04e5a0f44c92167b8b5.tar.bz2 mpv-2a79f108d65f2dfd4448a04e5a0f44c92167b8b5.tar.xz | |
added support for unlimited video resolution (-1)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4281 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vosub_vidix.c')
| -rw-r--r-- | libvo/vosub_vidix.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c index 76bca3f716..24af5bedd9 100644 --- a/libvo/vosub_vidix.c +++ b/libvo/vosub_vidix.c @@ -3,6 +3,7 @@ * vosub_vidix.c * * Copyright (C) Nick Kurshev <nickols_k@mail.ru> - 2002 + * Copyright (C) Alex Beregszaszi * * You can redistribute this file under terms and conditions * of GNU General Public licence v2. @@ -86,12 +87,18 @@ int vidix_init(unsigned src_width,unsigned src_height, "format=%s dest_bpp=%u vid_w=%u vid_h=%u\n" ,src_width,src_height,x_org,y_org,dst_width,dst_height ,vo_format_name(format),dest_bpp,vid_w,vid_h); - if(vid_w > vidix_cap.maxwidth || vid_w < vidix_cap.minwidth || - vid_h > vidix_cap.maxheight || vid_h < vidix_cap.minheight) + + if(((vidix_cap.maxwidth != -1) && (vid_w > vidix_cap.maxwidth)) || + ((vidix_cap.minwidth != -1) && (vid_w < vidix_cap.minwidth)) || + ((vidix_cap.maxheight != -1) && (vid_h > vidix_cap.maxheight)) || + ((vidix_cap.minwidth != -1 ) && (vid_h < vidix_cap.minheight))) { - printf("vosub_vidix: video server has unsupported resolution by vidix\n"); + printf("vosub_vidix: video server has unsupported resolution (%dx%d), supported: %dx%d-%dx%d\n", + vid_w, vid_h, vidix_cap.minwidth, vidix_cap.minheight, + vidix_cap.maxwidth, vidix_cap.maxheight); return -1; } + err = 0; switch(dest_bpp) { |