diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-09-23 18:19:29 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-09-23 18:19:29 +0100 |
| commit | 81e0d9f0ddaa5465cf8f9ec5ca2aad7df8d3b4ab (patch) | |
| tree | f6c25b308dfd61acb8e5cd687a68f2f580d28ec6 /src/video_out | |
| parent | 486fe1fc46d5f5a87696488184de7b7a5a9cb857 (diff) | |
| parent | 4100ae40f29ee52181e927a8976b04614f6e1620 (diff) | |
| download | xine-lib-81e0d9f0ddaa5465cf8f9ec5ca2aad7df8d3b4ab.tar.gz xine-lib-81e0d9f0ddaa5465cf8f9ec5ca2aad7df8d3b4ab.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'src/video_out')
| -rw-r--r-- | src/video_out/video_out_opengl.c | 2 | ||||
| -rw-r--r-- | src/video_out/xxmc.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index 1840dabf1..2028cd999 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -960,7 +960,7 @@ static int render_setup_fp_yuv (opengl_driver_t *this) { glGetIntegerv (MYGL_PROGRAM_ERROR_POSITION_ARB, &errorpos); if (errorpos != -1) xprintf (this->xine, XINE_VERBOSITY_NONE, - "video_out_opengl: fragprog_yuv errorpos %d begining with '%.20s'. Ask a wizard.\n", + "video_out_opengl: fragprog_yuv errorpos %d beginning with '%.20s'. Ask a wizard.\n", errorpos, fragprog_yuv+errorpos); glEnable (MYGL_FRAGMENT_PROGRAM_ARB); diff --git a/src/video_out/xxmc.h b/src/video_out/xxmc.h index 1d5852b09..7ea60bec9 100644 --- a/src/video_out/xxmc.h +++ b/src/video_out/xxmc.h @@ -77,11 +77,9 @@ #include <X11/extensions/XShm.h> #include <X11/extensions/Xv.h> #include <X11/extensions/Xvlib.h> +#include <X11/extensions/XvMClib.h> #ifdef HAVE_VLDXVMC #include <X11/extensions/vldXvMC.h> -#else - #include <X11/extensions/XvMClib.h> - #include <X11/extensions/XvMC.h> #endif #define LOG_MODULE "video_out_xxmc" |