From 9e6362dd890cd3a262b9f0b57f2b667b46db59a5 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Mon, 2 Feb 2004 17:23:27 +0000 Subject: [PATCH] change NULL to (NULL) for GST_ELEMENT_ERROR Original commit message from CVS: change NULL to (NULL) for GST_ELEMENT_ERROR Make sure errors end with "." --- common | 2 +- ext/ffmpeg/gstffmpegdec.c | 4 ++-- ext/ffmpeg/gstffmpegdemux.c | 2 +- ext/ffmpeg/gstffmpegmux.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common b/common index 5da247b..508678c1 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 5da247bb6f217c5c32e5ebab0d3a2014dfa452c3 +Subproject commit 508678c12ea745e207eb8bb3be12c156e3bb698c diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index b8c7569..6828406 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -324,7 +324,7 @@ gst_ffmpegdec_chain (GstPad *pad, gint have_data; if (!ffmpegdec->opened) { - GST_ELEMENT_ERROR (ffmpegdec, CORE, NEGOTIATION, NULL, + GST_ELEMENT_ERROR (ffmpegdec, CORE, NEGOTIATION, (NULL), ("ffdec_%s: input format was not set before data start", oclass->in_plugin->name)); return; @@ -414,7 +414,7 @@ gst_ffmpegdec_chain (GstPad *pad, ffmpegdec->context); if (caps == NULL || !gst_pad_set_explicit_caps (ffmpegdec->srcpad, caps)) { - GST_ELEMENT_ERROR (ffmpegdec, CORE, NEGOTIATION, NULL, + GST_ELEMENT_ERROR (ffmpegdec, CORE, NEGOTIATION, (NULL), ("Failed to link ffmpeg decoder (%s) to next element", oclass->in_plugin->name)); return; diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c index ce5986b..2fd9a8f 100644 --- a/ext/ffmpeg/gstffmpegdemux.c +++ b/ext/ffmpeg/gstffmpegdemux.c @@ -241,7 +241,7 @@ gst_ffmpegdemux_loop (GstElement *element) ffmpegdemux->sinkpad), oclass->in_plugin, 0, NULL); if (res < 0) { - GST_ELEMENT_ERROR (ffmpegdemux, LIBRARY, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (ffmpegdemux, LIBRARY, TOO_LAZY, (NULL), ("Failed to open demuxer/file context")); return; } diff --git a/ext/ffmpeg/gstffmpegmux.c b/ext/ffmpeg/gstffmpegmux.c index 0073541..b9bce61 100644 --- a/ext/ffmpeg/gstffmpegmux.c +++ b/ext/ffmpeg/gstffmpegmux.c @@ -330,7 +330,7 @@ gst_ffmpegmux_loop (GstElement *element) if (url_fopen (&ffmpegmux->context->pb, ffmpegmux->context->filename, URL_WRONLY) < 0) { - GST_ELEMENT_ERROR (element, LIBRARY, TOO_LAZY, NULL, + GST_ELEMENT_ERROR (element, LIBRARY, TOO_LAZY, (NULL), ("Failed to open stream context in ffmux")); return; } -- 2.7.4