diff options
author | Niklas Haas <git@haasn.xyz> | 2017-07-05 01:31:31 +0200 |
---|---|---|
committer | Niklas Haas <git@haasn.xyz> | 2017-07-05 11:22:00 +0200 |
commit | 6f77444f6c2d82feeebcd46a2b2f7ae3252648ef (patch) | |
tree | c7132ecd0dccd6f074232f2e20ce6b9405c4e098 /video/out | |
parent | 6e25934a8c3e7ccc9e562716ef712aa95de71e86 (diff) | |
download | mpv-6f77444f6c2d82feeebcd46a2b2f7ae3252648ef.tar.bz2 mpv-6f77444f6c2d82feeebcd46a2b2f7ae3252648ef.tar.xz |
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.
Diffstat (limited to 'video/out')
-rw-r--r-- | video/out/opengl/video.c | 6 |
1 files changed, 2 insertions, 4 deletions
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 |