diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
| commit | d5c868325cefcd5fad53361d1dfdc9757674eb70 (patch) | |
| tree | a838e509fdc2468220466e6337097b3ef590b00c /libvo/vo_gl2.c | |
| parent | 0cb5123c8f65b3d7715deb22ce8430eccc21996e (diff) | |
| parent | 5b3834c5d1033f05d798278c33782c5563247062 (diff) | |
| download | mpv-d5c868325cefcd5fad53361d1dfdc9757674eb70.tar.bz2 mpv-d5c868325cefcd5fad53361d1dfdc9757674eb70.tar.xz | |
Merge svn changes up to r26979
Most of the conflicts are trivial.
Conflicts:
Makefile
cfg-mplayer.h
input/input.c
libmenu/vf_menu.c
libmpcodecs/dec_video.c
libmpcodecs/vf_expand.c
libmpcodecs/vf_vo.c
libmpdemux/demux_mkv.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libvo/vo_directfb2.c
libvo/vo_gl.c
libvo/vo_winvidix.c
libvo/vo_xv.c
libvo/vo_xvidix.c
libvo/vo_xvmc.c
libvo/x11_common.c
mplayer.c
osdep/timer-linux.c
stream/cache2.c
Diffstat (limited to 'libvo/vo_gl2.c')
| -rw-r--r-- | libvo/vo_gl2.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index 22fd598499..68885c37c2 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -561,6 +561,9 @@ static int initGl(uint32_t d_width, uint32_t d_height) glDisable(GL_CULL_FACE); glEnable (GL_TEXTURE_2D); if (image_format == IMGFMT_YV12) { + gl_conversion_params_t params = {GL_TEXTURE_2D, use_yuv, + 0.0, 1.0, 0.0, 1.0, 1.0, 1.0, 1.0, + texture_width, texture_height}; switch (use_yuv) { case YUV_CONVERSION_FRAGMENT_LOOKUP: glGenTextures(1, &lookupTex); @@ -578,8 +581,7 @@ static int initGl(uint32_t d_width, uint32_t d_height) BindProgram(GL_FRAGMENT_PROGRAM, fragprog); break; } - glSetupYUVConversion(GL_TEXTURE_2D, use_yuv, 0.0, 1.0, 0.0, 1.0, 1.0, 1.0, 1.0, - texture_width, texture_height); + glSetupYUVConversion(¶ms); } gl_set_antialias(0); @@ -870,8 +872,10 @@ static int preinit(const char *arg) static int control(uint32_t request, void *data) { switch (request) { - case VOCTRL_PAUSE: return (int_pause=1); - case VOCTRL_RESUME: return (int_pause=0); + case VOCTRL_PAUSE: + case VOCTRL_RESUME: + int_pause = (request == VOCTRL_PAUSE); + return VO_TRUE; case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data)); case VOCTRL_GUISUPPORT: |