From 2a316c3506766a331f7c0ef717ae8bffe21da457 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 29 Nov 2013 14:19:44 +0100 Subject: 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. --- video/decode/vdpau_old.c | 1 + 1 file changed, 1 insertion(+) (limited to 'video/decode') 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; } -- cgit v1.2.3