diff options
| author | wm4 <wm4@nowhere> | 2012-12-12 23:55:41 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-01-13 20:04:10 +0100 |
| commit | 1b9d4a771a27d6017d826ed03dfbbc7ee976bf77 (patch) | |
| tree | 072cf35d588a85b5ea1939d9663770a927226deb /video/out/vo_sdl.c | |
| parent | c54fc507da8edcc2c5d3bc3f50b0881d1c1406d7 (diff) | |
| download | mpv-1b9d4a771a27d6017d826ed03dfbbc7ee976bf77.tar.bz2 mpv-1b9d4a771a27d6017d826ed03dfbbc7ee976bf77.tar.xz | |
video: remove things related to old DR code
Remove mp_image.width/height. The w/h members are the ones to use.
width/height were used internally by vf_get_image(), and sometimes for
other purposes.
Remove some image flags, most of which are now useless or completely
unused. This includes VFCAP_ACCEPT_STRIDE: the vf_expand insertion in
vf.c does nothing.
Remove some other unused mp_image fields.
Some rather messy changes in vo_opengl[_old] to get rid of legacy
mp_image flags and fields. This is left from when vo_gl supported DR.
Diffstat (limited to 'video/out/vo_sdl.c')
| -rw-r--r-- | video/out/vo_sdl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c index d04a63e5a6..2eeed1b66a 100644 --- a/video/out/vo_sdl.c +++ b/video/out/vo_sdl.c @@ -814,8 +814,7 @@ static int query_format(struct vo *vo, uint32_t format) { struct priv *vc = vo->priv; int i, j; - int cap = VFCAP_CSP_SUPPORTED | VFCAP_FLIP | VFCAP_ACCEPT_STRIDE | - VFCAP_OSD; + int cap = VFCAP_CSP_SUPPORTED | VFCAP_FLIP | VFCAP_OSD; for (i = 0; i < vc->renderer_info.num_texture_formats; ++i) for (j = 0; j < sizeof(formats) / sizeof(formats[0]); ++j) if (vc->renderer_info.texture_formats[i] == formats[j].sdl) @@ -941,8 +940,7 @@ static void update_screeninfo(struct vo *vo) static struct mp_image *get_screenshot(struct vo *vo) { struct priv *vc = vo->priv; - mp_image_t *image = alloc_mpi(vc->ssmpi->width, vc->ssmpi->height, - vc->ssmpi->imgfmt); + mp_image_t *image = alloc_mpi(vc->ssmpi->w, vc->ssmpi->h, vc->ssmpi->imgfmt); copy_mpi(image, vc->ssmpi); return image; } |