Mercurial > mplayer.hg
changeset 36188:34116de1aa96
Apply forgotten move of apply_border_pos function.
Fixes compilation.
| author | reimar |
|---|---|
| date | Sat, 25 May 2013 08:42:25 +0000 |
| parents | 09b2e3d9f51b |
| children | 71360817b772 |
| files | libvo/video_out.h libvo/vo_gl.c |
| diffstat | 2 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/video_out.h Sat May 25 07:43:22 2013 +0000 +++ b/libvo/video_out.h Sat May 25 08:42:25 2013 +0000 @@ -305,4 +305,13 @@ 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 */
--- a/libvo/vo_gl.c Sat May 25 07:43:22 2013 +0000 +++ b/libvo/vo_gl.c Sat May 25 08:42:25 2013 +0000 @@ -179,15 +179,6 @@ 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;