diff options
| author | wm4 <wm4@nowhere> | 2012-11-01 02:12:47 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-11-01 02:12:47 +0100 |
| commit | 84829a4ea1903e5db5782b72861fabc503a589cb (patch) | |
| tree | 26b4acbaf6dd4b255278dcc67f28bd83357c3b86 /libvo/aspect.h | |
| parent | e45dd051c304dec189d0d4d792a89c2988c3fa71 (diff) | |
| parent | f4069259cf7ffd24ac2a5b64e26a386185e94c7b (diff) | |
| download | mpv-84829a4ea1903e5db5782b72861fabc503a589cb.tar.bz2 mpv-84829a4ea1903e5db5782b72861fabc503a589cb.tar.xz | |
Merge branch 'osd_changes' into master
Conflicts:
DOCS/man/en/options.rst
Diffstat (limited to 'libvo/aspect.h')
| -rw-r--r-- | libvo/aspect.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libvo/aspect.h b/libvo/aspect.h index aa117833f3..c5247421d2 100644 --- a/libvo/aspect.h +++ b/libvo/aspect.h @@ -24,10 +24,7 @@ struct vo; void panscan_init(struct vo *vo); void panscan_calc_windowed(struct vo *vo); -void aspect_save_orig(struct vo *vo, int orgw, int orgh); - -void aspect_save_prescale(struct vo *vo, int prew, int preh); - +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 |