diff options
author | wm4 <wm4@nowhere> | 2013-11-29 14:19:44 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-11-29 14:19:44 +0100 |
commit | 2a316c3506766a331f7c0ef717ae8bffe21da457 (patch) | |
tree | 28de54650219123a2697e6620082c8d2a210ad6f /video/decode | |
parent | 60cd30055812d95aba453bdcb9b316e63fda5a31 (diff) | |
download | mpv-2a316c3506766a331f7c0ef717ae8bffe21da457.tar.bz2 mpv-2a316c3506766a331f7c0ef717ae8bffe21da457.tar.xz |
vdpau: always let decoder output IMGFMT_VDPAU
The old ffmpeg vdpau support code uses separate vdpau pixel formats for
each decoder (pretty much because mplayer's architecture sucked), which
just gets into the way. Force the old decoder's output to IMGFMT_VDPAU,
and remove IMGFMT_IS_VDPAU() where we can remove it.
This should completely remove the differences betwene the old and new
vdpau decoder outside of the decoder.
Diffstat (limited to 'video/decode')
-rw-r--r-- | video/decode/vdpau_old.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/video/decode/vdpau_old.c b/video/decode/vdpau_old.c index 24486a6b23..8b7950c876 100644 --- a/video/decode/vdpau_old.c +++ b/video/decode/vdpau_old.c @@ -255,6 +255,7 @@ static struct mp_image *process_image(struct lavc_ctx *ctx, struct mp_image *img struct vdpau_render_state *rndr = (void *)img->planes[0]; img->planes[0] = (void *)"dummy"; // must be non-NULL, otherwise arbitrary img->planes[3] = (void *)(intptr_t)rndr->surface; + mp_image_setfmt(img, IMGFMT_VDPAU); return img; } |