diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2003-09-16 09:59:53 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2003-09-16 09:59:53 +0000 |
| commit | 306d1a5ec40a07fa3ba782b32688e56596c33d89 (patch) | |
| tree | f953eff1969a0523d3a772b054ddf00f0c91ac6d | |
| parent | c05cf86c52ac837a90c8809f4bb2dde5a8450fbb (diff) | |
reverting error patch before making a branch.BRANCH-ERROR-ROOTBRANCH-ERROR
Original commit message from CVS:
reverting error patch before making a branch.
| -rw-r--r-- | ext/ffmpeg/gstffmpegdec.c | 14 | ||||
| -rw-r--r-- | ext/ffmpeg/gstffmpegdemux.c | 5 | ||||
| -rw-r--r-- | ext/ffmpeg/gstffmpegmux.c | 5 |
3 files changed, 10 insertions, 14 deletions
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index dc9e81f..efab63a 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -281,10 +281,9 @@ gst_ffmpegdec_chain (GstPad *pad, gint have_data; if (!ffmpegdec->opened) { - gst_element_gerror(GST_ELEMENT (ffmpegdec), GST_ERROR_UNKNOWN, - g_strdup ("unconverted error, file a bug"), - g_strdup_printf("ffdec_%s: input format was not set before data-start", - oclass->in_plugin->name)); + gst_element_error (GST_ELEMENT (ffmpegdec), + "ffdec_%s: input format was not set before data-start", + oclass->in_plugin->name); return; } @@ -346,10 +345,9 @@ gst_ffmpegdec_chain (GstPad *pad, ffmpegdec->context); if (caps == NULL || gst_pad_try_set_caps (ffmpegdec->srcpad, caps) <= 0) { - gst_element_gerror(GST_ELEMENT (ffmpegdec), GST_ERROR_UNKNOWN, - g_strdup ("unconverted error, file a bug"), - g_strdup_printf ("Failed to link ffmpeg decoder (%s) to next element", - oclass->in_plugin->name)); + gst_element_error (GST_ELEMENT (ffmpegdec), + "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 f68ee83..142ce54 100644 --- a/ext/ffmpeg/gstffmpegdemux.c +++ b/ext/ffmpeg/gstffmpegdemux.c @@ -212,9 +212,8 @@ gst_ffmpegdemux_loop (GstElement *element) ffmpegdemux->sinkpad), oclass->in_plugin, 0, NULL); if (res < 0) { - gst_element_gerror(GST_ELEMENT (ffmpegdemux), GST_ERROR_UNKNOWN, - g_strdup ("unconverted error, file a bug"), - g_strdup_printf ("Failed to open demuxer/file context")); + gst_element_error (GST_ELEMENT (ffmpegdemux), + "Failed to open demuxer/file context"); return; } diff --git a/ext/ffmpeg/gstffmpegmux.c b/ext/ffmpeg/gstffmpegmux.c index 8d370d7..b789c90 100644 --- a/ext/ffmpeg/gstffmpegmux.c +++ b/ext/ffmpeg/gstffmpegmux.c @@ -295,9 +295,8 @@ gst_ffmpegmux_loop (GstElement *element) if (url_fopen (&ffmpegmux->context->pb, ffmpegmux->context->filename, URL_WRONLY) < 0) { - gst_element_gerror(element, GST_ERROR_UNKNOWN, - g_strdup ("unconverted error, file a bug"), - g_strdup_printf ("Failed to open stream context in ffmux")); + gst_element_error (element, + "Failed to open stream context in ffmux"); return; } |