diff options
| author | wm4 <wm4@nowhere> | 2013-03-14 16:21:37 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-03-17 22:07:13 +0100 |
| commit | 4b87cb39a396dc8fa6738069c9de36fcd599db53 (patch) | |
| tree | cb899d3db6a0c842b6cfcb98db88db6289004552 /video/out/aspect.h | |
| parent | 59960baa7f61eaff352043a15eaaf5792d9e8cfd (diff) | |
| download | mpv-4b87cb39a396dc8fa6738069c9de36fcd599db53.tar.bz2 mpv-4b87cb39a396dc8fa6738069c9de36fcd599db53.tar.xz | |
video: simplify aspect calculation stuff
Remove lots of weird logic and dead code.
The only difference is that when specifying a monitor aspect ratio, it
will always upscale and never downscale.
Diffstat (limited to 'video/out/aspect.h')
| -rw-r--r-- | video/out/aspect.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/video/out/aspect.h b/video/out/aspect.h index c5247421d2..8455985153 100644 --- a/video/out/aspect.h +++ b/video/out/aspect.h @@ -21,17 +21,11 @@ /* Stuff for correct aspect scaling. */ struct vo; -void panscan_init(struct vo *vo); -void panscan_calc_windowed(struct vo *vo); void aspect_save_videores(struct vo *vo, int w, int h, int d_w, int d_h); void aspect_save_screenres(struct vo *vo, int scrw, int scrh); -#define A_WINZOOM 2 ///< zoom to fill window size -#define A_ZOOM 1 -#define A_NOZOOM 0 - -void aspect(struct vo *vo, int *srcw, int *srch, int zoom); -void aspect_fit(struct vo *vo, int *srcw, int *srch, int fitw, int fith); +void aspect_calc_monitor(struct vo *vo, int *w, int *h); +void aspect_calc_panscan(struct vo *vo, int *out_w, int *out_h); #endif /* MPLAYER_ASPECT_H */ |