summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
Diffstat (limited to 'libvo')
-rw-r--r--libvo/geometry.h2
-rw-r--r--libvo/vo_fbdev.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/libvo/geometry.h b/libvo/geometry.h
index dbfea6cd3b..2f4491592e 100644
--- a/libvo/geometry.h
+++ b/libvo/geometry.h
@@ -2,8 +2,6 @@
#ifndef __GEOMETRY_H
#define __GEOMETRY_H
-#include "aspect.h"
-
extern char *vo_geometry;
int geometry(int *xpos, int *ypos, int scrw, int scrh, int vidw, int vidh, int fs);
diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c
index a9f0608ad4..e86a15a652 100644
--- a/libvo/vo_fbdev.c
+++ b/libvo/vo_fbdev.c
@@ -1037,7 +1037,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
image_width=width;
image_height=height;
}
- geometry(&x_offset,&y_offset,fb_xres,fb_yres,image_width,image_height);
+ geometry(&x_offset,&y_offset,fb_xres,fb_yres,image_width,image_height,fs);
if(vidix_init(width,height,x_offset,y_offset,image_width,
image_height,format,fb_bpp,
@@ -1061,7 +1061,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
return 1;
}
- geometry(&x_offset,&y_offset,fb_xres,fb_yres,out_width,out_height);
+ geometry(&x_offset,&y_offset,fb_xres,fb_yres,out_width,out_height,fs);
L123123875 = frame_buffer + (out_width - in_width) * fb_pixel_size /
2 + ( (out_height - in_height) / 2 ) * fb_line_len +