diff options
| author | wm4 <wm4@nowhere> | 2015-06-05 19:18:12 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-06-05 22:34:16 +0200 |
| commit | 650469d65b6c0b18630ee4f7e7da4fad10c6dfbc (patch) | |
| tree | ec0decd30ac9ef70b4ae21b5461dba2b227ded2b | |
| parent | f30b28de46aa739758858a88095e0457e8860119 (diff) | |
| download | mpv-650469d65b6c0b18630ee4f7e7da4fad10c6dfbc.tar.bz2 mpv-650469d65b6c0b18630ee4f7e7da4fad10c6dfbc.tar.xz | |
vo_vdpau: shorten 2 variable names
Why should I be required to type so much?
| -rw-r--r-- | video/out/vo_vdpau.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c index f7a1be3a60..9eaeb4ba17 100644 --- a/video/out/vo_vdpau.c +++ b/video/out/vo_vdpau.c @@ -84,7 +84,7 @@ struct vdpctx { struct mp_image *current_image; - int output_surface_width, output_surface_height; + int output_surface_w, output_surface_h; int force_yuv; struct mp_vdpau_mixer *video_mixer; @@ -243,10 +243,9 @@ static void resize(struct vo *vo) 1000LL * vc->flip_offset_window; vo_set_flip_queue_params(vo, vc->flip_offset_us, false); - if (vc->output_surface_width < vo->dwidth - || vc->output_surface_height < vo->dheight) { - vc->output_surface_width = s_size(vc->output_surface_width, vo->dwidth); - vc->output_surface_height = s_size(vc->output_surface_height, vo->dheight); + if (vc->output_surface_w < vo->dwidth || vc->output_surface_h < vo->dheight) { + vc->output_surface_w = s_size(vc->output_surface_w, vo->dwidth); + vc->output_surface_h = s_size(vc->output_surface_h, vo->dheight); // Creation of output_surfaces for (int i = 0; i < vc->num_output_surfaces; i++) if (vc->output_surfaces[i] != VDP_INVALID_HANDLE) { @@ -257,8 +256,8 @@ static void resize(struct vo *vo) for (int i = 0; i < vc->num_output_surfaces; i++) { vdp_st = vdp->output_surface_create(vc->vdp_device, OUTPUT_RGBA_FORMAT, - vc->output_surface_width, - vc->output_surface_height, + vc->output_surface_w, + vc->output_surface_h, &vc->output_surfaces[i]); CHECK_VDP_WARNING(vo, "Error when calling vdp_output_surface_create"); MP_DBG(vo, "vdpau out create: %u\n", @@ -381,7 +380,7 @@ static void mark_vdpau_objects_uninitialized(struct vo *vo) .surface = VDP_INVALID_HANDLE, }; } - vc->output_surface_width = vc->output_surface_height = -1; + vc->output_surface_w = vc->output_surface_h = -1; } static bool check_preemption(struct vo *vo) @@ -867,8 +866,8 @@ static struct mp_image *get_window_screenshot(struct vo *vo) int last_surface = WRAP_ADD(vc->surface_num, -1, vc->num_output_surfaces); VdpOutputSurface screen = vc->output_surfaces[last_surface]; struct mp_image *image = read_output_surface(vo, screen, - vc->output_surface_width, - vc->output_surface_height); + vc->output_surface_w, + vc->output_surface_h); mp_image_set_size(image, vo->dwidth, vo->dheight); return image; } |