From 6f77444f6c2d82feeebcd46a2b2f7ae3252648ef Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Wed, 5 Jul 2017 01:31:31 +0200 Subject: vo_opengl: get rid of weird double-bind in pass_read_fbo This logic doesn't really make sense. copy_img_tex already binds the texture, so why would we bind it a second time? Furthermore, nothing actually uses this return value. Must have been some left-over artifact of a previous iteration of this function. Anyway, it's harmless, just nonsensical. So remove it. --- video/out/opengl/video.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'video/out/opengl/video.c') diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c index 9efeb200b0..bc218792fd 100644 --- a/video/out/opengl/video.c +++ b/video/out/opengl/video.c @@ -1989,13 +1989,11 @@ static void pass_read_video(struct gl_video *p) } // Utility function that simply binds an FBO and reads from it, without any -// transformations. Returns the ID of the texture unit it was bound to -static int pass_read_fbo(struct gl_video *p, struct fbotex *fbo) +// transformations. +static void pass_read_fbo(struct gl_video *p, struct fbotex *fbo) { struct img_tex tex = img_tex_fbo(fbo, PLANE_RGB, p->components); copy_img_tex(p, &(int){0}, tex); - - return pass_bind(p, tex); } // yuv conversion, and any other conversions before main up/down-scaling -- cgit v1.2.3