From 8f88f015f0f4d98611956a3d6eabc87244e265fc Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 4 Jun 2012 15:26:21 +0200 Subject: [PATCH] video: don't add empty colorimetry to caps Don't use extra default colorimetry entries in the table to construct an output colorimetry shortcut because they don't have a name. --- gst-libs/gst/video/video.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gst-libs/gst/video/video.c b/gst-libs/gst/video/video.c index 8418250..aee2c2f 100644 --- a/gst-libs/gst/video/video.c +++ b/gst-libs/gst/video/video.c @@ -1859,7 +1859,7 @@ typedef struct { GST_VIDEO_COLOR_RANGE ##r, GST_VIDEO_COLOR_MATRIX_ ##m, \ GST_VIDEO_TRANSFER_ ##t, GST_VIDEO_COLOR_PRIMARIES_ ##p } } -#define GST_VIDEO_COLORIMETRY_NONAME "" +#define GST_VIDEO_COLORIMETRY_NONAME NULL #define DEFAULT_YUV_SD 0 #define DEFAULT_YUV_HD 1 @@ -2002,7 +2002,7 @@ gst_video_get_colorimetry (const gchar * s) { gint i; - for (i = 0; i < G_N_ELEMENTS (colorimetry); i++) { + for (i = 0; colorimetry[i].name; i++) { if (g_str_equal (colorimetry[i].name, s)) return &colorimetry[i]; } @@ -2048,7 +2048,7 @@ gst_video_caps_set_colorimetry (GstCaps * caps, GstVideoColorimetry * cinfo) { gint i; - for (i = 0; i < G_N_ELEMENTS (colorimetry); i++) { + for (i = 0; colorimetry[i].name; i++) { if (IS_EQUAL (&colorimetry[i], cinfo)) { gst_caps_set_simple (caps, "colorimetry", G_TYPE_STRING, colorimetry[i].name, NULL); -- 2.7.4