summaryrefslogtreecommitdiffstats
path: root/video/out/vo.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-07-29 00:21:02 +0200
committerwm4 <wm4@nowhere>2014-07-29 00:21:02 +0200
commitfa34b4920aa372e2fb07b970a9242b41bddccf15 (patch)
tree16f4733730a6580eb4972b12ccb1583f41f0834b /video/out/vo.c
parentd563dc8cb94e6313871646ca51f502f9db19b177 (diff)
downloadmpv-fa34b4920aa372e2fb07b970a9242b41bddccf15.tar.bz2
mpv-fa34b4920aa372e2fb07b970a9242b41bddccf15.tar.xz
vdpau: don't upload video images in advance
With software decoding, images were uploaded to vdpau surfaces as they were queued to the VO. This makes it slightly more complicated (especially later on), and has no advantages - so stop doing it. The only reason why this was done explicitly was due to attempts to keep the code equivalent (instead of risking performance regressions). The original code did this naturally for certain reasons, but now that we can measure that it has no advantages and just requires extra code, we can just drop it.
Diffstat (limited to 'video/out/vo.c')
-rw-r--r--video/out/vo.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/video/out/vo.c b/video/out/vo.c
index 2a640d8ea3..3962ed6135 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -288,12 +288,6 @@ void vo_queue_image(struct vo *vo, struct mp_image *mpi)
if (!vo->config_ok)
return;
assert(mp_image_params_equal(vo->params, &mpi->params));
- if (vo->driver->filter_image && mpi)
- mpi = vo->driver->filter_image(vo, mpi);
- if (!mpi) {
- MP_ERR(vo, "Could not upload image.\n");
- return;
- }
assert(vo->max_video_queue <= VO_MAX_QUEUE);
assert(vo->num_video_queue < vo->max_video_queue);
vo->video_queue[vo->num_video_queue++] = mpi;