From 213898e8dcc254caceee697bba9f79cc923f9b10 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 21 Nov 2005 13:32:36 +0000 Subject: [PATCH] Fixes for GST_FOURCC_FORMAT API change. Original commit message from CVS: * gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps), (gst_riff_create_iavs_caps): * gst-libs/gst/riff/riff-read.c: (gst_riff_parse_file_header), (gst_riff_parse_strh), (gst_riff_parse_strf_vids), (gst_riff_parse_info): * gst/videotestsrc/videotestsrc.c: (paintinfo_find_by_structure): * sys/v4l/gstv4lsrc.c: (gst_v4lsrc_set_caps): * sys/xvimage/xvimagesink.c: (gst_xvimagesink_setcaps): Fixes for GST_FOURCC_FORMAT API change. --- ChangeLog | 12 ++++++++++++ gst-libs/gst/riff/riff-media.c | 4 ++-- gst-libs/gst/riff/riff-read.c | 10 +++++----- gst/videotestsrc/videotestsrc.c | 2 +- sys/v4l/gstv4lsrc.c | 2 +- sys/xvimage/xvimagesink.c | 2 +- 6 files changed, 22 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 918afdf..1830bde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2005-11-21 Tim-Philipp Müller + + * gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps), + (gst_riff_create_iavs_caps): + * gst-libs/gst/riff/riff-read.c: (gst_riff_parse_file_header), + (gst_riff_parse_strh), (gst_riff_parse_strf_vids), + (gst_riff_parse_info): + * gst/videotestsrc/videotestsrc.c: (paintinfo_find_by_structure): + * sys/v4l/gstv4lsrc.c: (gst_v4lsrc_set_caps): + * sys/xvimage/xvimagesink.c: (gst_xvimagesink_setcaps): + Fixes for GST_FOURCC_FORMAT API change. + 2005-11-21 Andy Wingo patch by: Alessandro Dessina diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c index 68f30d4..7bf8c4f 100644 --- a/gst-libs/gst/riff/riff-media.c +++ b/gst-libs/gst/riff/riff-media.c @@ -357,7 +357,7 @@ gst_riff_create_video_caps (guint32 codec_fcc, break; default: - GST_WARNING ("Unknown video fourcc " GST_FOURCC_FORMAT, + GST_WARNING ("Unknown video fourcc %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (codec_fcc)); return NULL; } @@ -609,7 +609,7 @@ gst_riff_create_iavs_caps (guint32 codec_fcc, break; default: - GST_WARNING ("Unknown IAVS fourcc " GST_FOURCC_FORMAT, + GST_WARNING ("Unknown IAVS fourcc %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (codec_fcc)); return NULL; } diff --git a/gst-libs/gst/riff/riff-read.c b/gst-libs/gst/riff/riff-read.c index cfabd9c..25a80a3 100644 --- a/gst-libs/gst/riff/riff-read.c +++ b/gst-libs/gst/riff/riff-read.c @@ -186,7 +186,7 @@ gst_riff_parse_file_header (GstElement * element, tag = GST_READ_UINT32_LE (data); if (tag != GST_RIFF_TAG_RIFF) { GST_ELEMENT_ERROR (element, STREAM, WRONG_TYPE, (NULL), - ("Stream is no RIFF stream: " GST_FOURCC_FORMAT, + ("Stream is no RIFF stream: %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (tag))); gst_buffer_unref (buf); return FALSE; @@ -254,9 +254,9 @@ gst_riff_parse_strh (GstElement * element, /* debug */ GST_INFO_OBJECT (element, "strh tag found:"); - GST_INFO_OBJECT (element, " type " GST_FOURCC_FORMAT, + GST_INFO_OBJECT (element, " type %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (strh->type)); - GST_INFO_OBJECT (element, " fcc_handler " GST_FOURCC_FORMAT, + GST_INFO_OBJECT (element, " fcc_handler %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (strh->fcc_handler)); GST_INFO_OBJECT (element, " flags 0x%08x", strh->flags); GST_INFO_OBJECT (element, " priority %d", strh->priority); @@ -342,7 +342,7 @@ gst_riff_parse_strf_vids (GstElement * element, GST_INFO_OBJECT (element, " height %d", strf->height); GST_INFO_OBJECT (element, " planes %d", strf->planes); GST_INFO_OBJECT (element, " bit_cnt %d", strf->bit_cnt); - GST_INFO_OBJECT (element, " compression " GST_FOURCC_FORMAT, + GST_INFO_OBJECT (element, " compression %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (strf->compression)); GST_INFO_OBJECT (element, " image_size %d", strf->image_size); GST_INFO_OBJECT (element, " xpels_meter %d", strf->xpels_meter); @@ -615,7 +615,7 @@ gst_riff_parse_info (GstElement * element, default: type = NULL; GST_WARNING_OBJECT (element, - "Unknown INFO (metadata) tag entry " GST_FOURCC_FORMAT, + "Unknown INFO (metadata) tag entry %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (tag)); break; } diff --git a/gst/videotestsrc/videotestsrc.c b/gst/videotestsrc/videotestsrc.c index 91603b6..5f90a27 100644 --- a/gst/videotestsrc/videotestsrc.c +++ b/gst/videotestsrc/videotestsrc.c @@ -386,7 +386,7 @@ paintinfo_find_by_structure (const GstStructure * structure) return NULL; for (i = 0; i < n_fourccs; i++) { s = fourcc_list[i].fourcc; - //g_print("testing " GST_FOURCC_FORMAT " and %s\n", GST_FOURCC_ARGS(format), s); + /* g_print("testing %" GST_FOURCC_FORMAT " and %s\n", GST_FOURCC_ARGS(format), s); */ fourcc = GST_MAKE_FOURCC (s[0], s[1], s[2], s[3]); if (fourcc == format) { return fourcc_list + i; diff --git a/sys/v4l/gstv4lsrc.c b/sys/v4l/gstv4lsrc.c index 66fe2eb..78da900 100644 --- a/sys/v4l/gstv4lsrc.c +++ b/sys/v4l/gstv4lsrc.c @@ -572,7 +572,7 @@ gst_v4lsrc_set_caps (GstBaseSrc * src, GstCaps * caps) } if (palette == -1) { - GST_WARNING_OBJECT (v4lsrc, "palette for fourcc " GST_FOURCC_FORMAT + GST_WARNING_OBJECT (v4lsrc, "palette for fourcc %" GST_FOURCC_FORMAT " is -1, refusing link", GST_FOURCC_ARGS (fourcc)); return FALSE; } diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c index 8d8ab89..5c0d195 100644 --- a/sys/xvimage/xvimagesink.c +++ b/sys/xvimage/xvimagesink.c @@ -1425,7 +1425,7 @@ gst_xvimagesink_setcaps (GstBaseSink * bsink, GstCaps * caps) (video_width != xvimagesink->xvimage->width) || (video_height != xvimagesink->xvimage->height))) { GST_DEBUG_OBJECT (xvimagesink, - "old format " GST_FOURCC_FORMAT ", new format " GST_FOURCC_FORMAT, + "old format %" GST_FOURCC_FORMAT ", new format %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (xvimagesink->xcontext->im_format), GST_FOURCC_ARGS (im_format)); GST_DEBUG_OBJECT (xvimagesink, "renewing xvimage"); -- 2.7.4