summaryrefslogtreecommitdiffstats
path: root/video/out/opengl/hwdec_vdpau.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-09-24 23:48:57 +0200
committerwm4 <wm4@nowhere>2015-09-24 23:48:57 +0200
commit57831d52dc0c8d22feb497d06ac934192b5b907b (patch)
tree6cd48f5851ec2837cbf8120ede3f258c02c261c5 /video/out/opengl/hwdec_vdpau.c
parentb14c9eb748d80cff3e362c2093a8fb26bce337cf (diff)
downloadmpv-57831d52dc0c8d22feb497d06ac934192b5b907b.tar.bz2
mpv-57831d52dc0c8d22feb497d06ac934192b5b907b.tar.xz
vo_opengl: actually set hardware decoder mapped texture format
Surfaces used by hardware decoding formats can be mapped exactly like a specific software pixel format, e.g. RGBA or NV12. p->image_params is supposed to be set to this format, but it wasn't. (How did this ever work?) Also, setting params->imgfmt in the hwdec interop drivers is pointless and redundant. (Change them to asserts, because why not.)
Diffstat (limited to 'video/out/opengl/hwdec_vdpau.c')
-rw-r--r--video/out/opengl/hwdec_vdpau.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/opengl/hwdec_vdpau.c b/video/out/opengl/hwdec_vdpau.c
index ac1b7bef05..b9320ba842 100644
--- a/video/out/opengl/hwdec_vdpau.c
+++ b/video/out/opengl/hwdec_vdpau.c
@@ -134,7 +134,7 @@ static int reinit(struct gl_hwdec *hw, struct mp_image_params *params)
destroy_objects(hw);
- params->imgfmt = hw->driver->imgfmt;
+ assert(params->imgfmt == hw->driver->imgfmt);
p->image_params = *params;
if (mp_vdpau_handle_preemption(p->ctx, &p->preemption_counter) < 1)