r36284 - in trunk/libvo: video_out.h vo_gl.c
Author: reimar Date: Sat May 25 10:42:25 2013 New Revision: 36284 Log: Apply forgotten move of apply_border_pos function. Fixes compilation. Modified: trunk/libvo/video_out.h trunk/libvo/vo_gl.c Modified: trunk/libvo/video_out.h ============================================================================== --- trunk/libvo/video_out.h Sat May 25 09:43:22 2013 (r36283) +++ trunk/libvo/video_out.h Sat May 25 10:42:25 2013 (r36284) @@ -305,4 +305,13 @@ static inline int aspect_scaling(void) return vo_fs || vo_keepaspect; } +static inline int apply_border_pos(int full, int part, float pos) { + if (pos >= 0.0 && pos <= 1.0) { + return pos*(full - part); + } + if (pos < 0) + return pos * part; + return full - part + (pos - 1) * part; +} + #endif /* MPLAYER_VIDEO_OUT_H */ Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Sat May 25 09:43:22 2013 (r36283) +++ trunk/libvo/vo_gl.c Sat May 25 10:42:25 2013 (r36284) @@ -179,15 +179,6 @@ static void redraw(void); static float video_matrix[16]; static float osd_matrix[16]; -static int apply_border_pos(int full, int part, float pos) { - if (pos >= 0.0 && pos <= 1.0) { - return pos*(full - part); - } - if (pos < 0) - return pos * part; - return full - part + (pos - 1) * part; -} - static void resize(void) { int i; draw_width = (vo_rotate & 1) ? vo_dheight : vo_dwidth;
participants (1)
-
reimar