diff options
| author | wm4 <wm4@nowhere> | 2014-04-20 21:27:45 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-04-21 02:57:16 +0200 |
| commit | 5e4e248dc200606e75bc382bebe045afc1962571 (patch) | |
| tree | 5484bf360536a81ae344e49b9c6d009a08c4c2f0 /video/out | |
| parent | 44096073e96c623f3e3c80bed7ee13d58869cecd (diff) | |
| download | mpv-5e4e248dc200606e75bc382bebe045afc1962571.tar.bz2 mpv-5e4e248dc200606e75bc382bebe045afc1962571.tar.xz | |
video: make mp_image use mp_image_params directly
Minor cleanup, so that we can stuff more information into
mp_image_params later.
Diffstat (limited to 'video/out')
| -rw-r--r-- | video/out/gl_hwdec_vaglx.c | 2 | ||||
| -rw-r--r-- | video/out/vo_vdpau.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/video/out/gl_hwdec_vaglx.c b/video/out/gl_hwdec_vaglx.c index 278718c67a..08c7f4957f 100644 --- a/video/out/gl_hwdec_vaglx.c +++ b/video/out/gl_hwdec_vaglx.c @@ -114,7 +114,7 @@ static int map_image(struct gl_hwdec *hw, struct mp_image *hw_image, status = vaCopySurfaceGLX(p->display, p->vaglx_surface, va_surface_id(hw_image), - va_get_colorspace_flag(hw_image->colorspace)); + va_get_colorspace_flag(hw_image->params.colorspace)); if (!CHECK_VA_STATUS(p, "vaCopySurfaceGLX()")) return -1; diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c index dfc6b4d599..40168cb734 100644 --- a/video/out/vo_vdpau.c +++ b/video/out/vo_vdpau.c @@ -1207,8 +1207,9 @@ static struct mp_image *read_output_surface(struct vo *vo, return NULL; struct mp_image *image = mp_image_alloc(IMGFMT_BGR32, width, height); - image->colorspace = MP_CSP_RGB; - image->levels = vo->params->outputlevels; // hardcoded with conv. matrix + image->params.colorspace = MP_CSP_RGB; + // hardcoded with conv. matrix + image->params.colorlevels = vo->params->outputlevels; void *dst_planes[] = { image->planes[0] }; uint32_t dst_pitches[] = { image->stride[0] }; |