diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2012-11-12 23:24:01 +0100 |
|---|---|---|
| committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2012-11-13 22:19:18 +0100 |
| commit | bec630c34753f7fbbac8712661b596ff5a76b7c1 (patch) | |
| tree | 633035ee2654d301ed9a13dd83f006b7cab173b5 /video | |
| parent | 9203f06cf32a260f0ed4209eb744c58e0e6db47b (diff) | |
| download | mpv-bec630c34753f7fbbac8712661b596ff5a76b7c1.tar.bz2 mpv-bec630c34753f7fbbac8712661b596ff5a76b7c1.tar.xz | |
clang: fix all warnings except deprecations
Diffstat (limited to 'video')
| -rw-r--r-- | video/out/gl_header_fixes.h | 3 | ||||
| -rw-r--r-- | video/out/vo_corevideo.m | 3 | ||||
| -rw-r--r-- | video/out/vo_opengl.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/video/out/gl_header_fixes.h b/video/out/gl_header_fixes.h index d149a9970a..41a3aabcd3 100644 --- a/video/out/gl_header_fixes.h +++ b/video/out/gl_header_fixes.h @@ -250,8 +250,11 @@ #define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 #define GLX_CONTEXT_FLAGS_ARB 0x2094 #define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126 +#ifndef __APPLE__ +// These are respectively 0x00000001 and 0x00000002 on OSX #define GLX_CONTEXT_DEBUG_BIT_ARB 0x0001 #define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002 +#endif #define GLX_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 #define GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 #endif diff --git a/video/out/vo_corevideo.m b/video/out/vo_corevideo.m index 627281b4e0..04ab7019d1 100644 --- a/video/out/vo_corevideo.m +++ b/video/out/vo_corevideo.m @@ -330,8 +330,9 @@ static CFStringRef get_cv_csp_matrix(struct vo *vo) return kCVImageBufferYCbCrMatrix_ITU_R_709_2; case MP_CSP_SMPTE_240M: return kCVImageBufferYCbCrMatrix_SMPTE_240M_1995; + default: + return kCVImageBufferYCbCrMatrix_ITU_R_601_4; } - return kCVImageBufferYCbCrMatrix_ITU_R_601_4; } static void set_yuv_colorspace(struct vo *vo) diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c index 1900fd84a1..0662c7474b 100644 --- a/video/out/vo_opengl.c +++ b/video/out/vo_opengl.c @@ -2208,7 +2208,7 @@ static int preinit(struct vo *vo, const char *arg) }; if (subopt_parse(arg, subopts) != 0) { - mp_msg(MSGT_VO, MSGL_FATAL, help_text); + mp_msg(MSGT_VO, MSGL_FATAL, "%s", help_text); goto err_out; } |