summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-03-30 03:29:54 +0100
committerwm4 <wm4@nowhere>2013-03-30 03:29:54 +0100
commit624fe1736ea9d088bfa1490d60a31868418561fc (patch)
tree673401e609f5f884dd11961f822c16e263698dc3 /video
parentb617863c247c4a509c118557afa030df16eca118 (diff)
downloadmpv-624fe1736ea9d088bfa1490d60a31868418561fc.tar.bz2
mpv-624fe1736ea9d088bfa1490d60a31868418561fc.tar.xz
gl_lcms: fix compilation when lcms2 is not available
Diffstat (limited to 'video')
-rw-r--r--video/out/gl_lcms.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/video/out/gl_lcms.c b/video/out/gl_lcms.c
index af639d50af..6cded6cd09 100644
--- a/video/out/gl_lcms.c
+++ b/video/out/gl_lcms.c
@@ -21,7 +21,6 @@
*/
#include <string.h>
-#include <lcms2.h>
#include "talloc.h"
@@ -36,6 +35,10 @@
#include "gl_video.h"
#include "gl_lcms.h"
+#ifdef CONFIG_LCMS2
+
+#include <lcms2.h>
+
static bool parse_3dlut_size(const char *s, int *p1, int *p2, int *p3)
{
if (sscanf(s, "%dx%dx%d", p1, p2, p3) != 3)
@@ -73,8 +76,6 @@ const struct m_sub_options mp_icc_conf = {
},
};
-#ifdef CONFIG_LCMS2
-
static void lcms2_error_handler(cmsContext ctx, cmsUInt32Number code,
const char *msg)
{
@@ -203,6 +204,12 @@ error_exit:
#else /* CONFIG_LCMS2 */
+const struct m_sub_options mp_icc_conf = {
+ .opts = (m_option_t[]) { {0} },
+ .size = sizeof(struct mp_icc_opts),
+ .defaults = &(const struct mp_icc_opts) {0},
+};
+
struct lut3d *mp_load_icc(struct mp_icc_opts *opts)
{
mp_msg(MSGT_VO, MSGL_FATAL, "[gl] LCMS2 support not compiled.\n");