Mercurial > mplayer.hg
comparison libvo/video_out.h @ 36188:34116de1aa96
Apply forgotten move of apply_border_pos function.
Fixes compilation.
author | reimar |
---|---|
date | Sat, 25 May 2013 08:42:25 +0000 |
parents | 3b15983f5e48 |
children | 673719da1a92 |
comparison
equal
deleted
inserted
replaced
36187:09b2e3d9f51b | 36188:34116de1aa96 |
---|---|
303 static inline int aspect_scaling(void) | 303 static inline int aspect_scaling(void) |
304 { | 304 { |
305 return vo_fs || vo_keepaspect; | 305 return vo_fs || vo_keepaspect; |
306 } | 306 } |
307 | 307 |
308 static inline int apply_border_pos(int full, int part, float pos) { | |
309 if (pos >= 0.0 && pos <= 1.0) { | |
310 return pos*(full - part); | |
311 } | |
312 if (pos < 0) | |
313 return pos * part; | |
314 return full - part + (pos - 1) * part; | |
315 } | |
316 | |
308 #endif /* MPLAYER_VIDEO_OUT_H */ | 317 #endif /* MPLAYER_VIDEO_OUT_H */ |