Commit 306d1a5e authored by Thomas Vander Stichele's avatar Thomas Vander Stichele
Browse files

reverting error patch before making a branch.

Original commit message from CVS:
reverting error patch before making a branch.
parent c05cf86c
......@@ -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;
}
}
......
......@@ -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;
}
......
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment