reverting error patch before making a branch.BRANCH-ERROR-ROOTBRANCH-ERROR

Original commit message from CVS:
reverting error patch before making a branch.

2 files changed, 17 insertions, 23 deletions

diff --git a/ext/divx/gstdivxdec.c b/ext/divx/gstdivxdec.c
index 173ee75c..011836f9 100644
--- a/ext/divx/gstdivxdec.c
+++ b/ext/divx/gstdivxdec.c
@@ -221,10 +221,9 @@ gst_divxdec_setup (GstDivxDec *divxdec)
   /* initialize the handle */
   memset(&xinit, 0, sizeof(DEC_INIT));
   if ((ret = decore(&handle, DEC_OPT_INIT, &xinit, NULL)) != 0) {
-    gst_element_gerror(GST_ELEMENT(divxdec), GST_ERROR_UNKNOWN,
-      g_strdup ("unconverted error, file a bug"),
-      g_strdup_printf("Error initializing divx decoding library: %s (%d)",
-                      gst_divxdec_error(ret), ret));
+    gst_element_error(GST_ELEMENT(divxdec),
+                      "Error initializing divx decoding library: %s (%d)",
+                      gst_divxdec_error(ret), ret);
     return FALSE;
   }
 
@@ -241,10 +240,9 @@ gst_divxdec_setup (GstDivxDec *divxdec)
 
   if ((ret = decore(divxdec->handle, DEC_OPT_SETOUT,
                     &output, NULL)) != 0) {
-    gst_element_gerror(GST_ELEMENT(divxdec), GST_ERROR_UNKNOWN,
-      g_strdup ("unconverted error, file a bug"),
-      g_strdup_printf("Error setting output format: %s (%d)",
-                      gst_divxdec_error(ret), ret));
+    gst_element_error(GST_ELEMENT(divxdec),
+                      "Error setting output format: %s (%d)",
+                      gst_divxdec_error(ret), ret);
     gst_divxdec_unset(divxdec);
     return FALSE;
   }
@@ -279,9 +277,8 @@ gst_divxdec_chain (GstPad    *pad,
 
   if (!divxdec->handle) {
     if (gst_divxdec_negotiate(divxdec) <= 0) {
-      gst_element_gerror(GST_ELEMENT(divxdec), GST_ERROR_UNKNOWN,
-        g_strdup ("unconverted error, file a bug"),
-        g_strdup_printf("No format set - aborting"));
+      gst_element_error(GST_ELEMENT(divxdec),
+                        "No format set - aborting");
       gst_buffer_unref(buf);
       return;
     }
@@ -304,10 +301,9 @@ gst_divxdec_chain (GstPad    *pad,
 
   if ((ret = decore(divxdec->handle, DEC_OPT_FRAME,
                     &xframe, NULL))) {
-    gst_element_gerror(GST_ELEMENT(divxdec), GST_ERROR_UNKNOWN,
-      g_strdup ("unconverted error, file a bug"),
-      g_strdup_printf("Error decoding divx frame: %s (%d)",
-                      gst_divxdec_error(ret), ret));
+    gst_element_error(GST_ELEMENT(divxdec),
+                      "Error decoding divx frame: %s (%d)",
+                      gst_divxdec_error(ret), ret);
     gst_buffer_unref(buf);
     return;
   }
diff --git a/ext/divx/gstdivxenc.c b/ext/divx/gstdivxenc.c
index cbd3159e..bd7547a1 100644
--- a/ext/divx/gstdivxenc.c
+++ b/ext/divx/gstdivxenc.c
@@ -302,10 +302,9 @@ gst_divxenc_setup (GstDivxEnc *divxenc)
   output.spatial_passes = 0;
 
   if ((ret = encore(&handle, ENC_OPT_INIT, &input, &output))) {
-    gst_element_gerror(GST_ELEMENT(divxenc), GST_ERROR_UNKNOWN,
-      g_strdup ("unconverted error, file a bug"),
-      g_strdup_printf("Error setting up divx encoder: %s (%d)",
-                      gst_divxenc_error(ret), ret));
+    gst_element_error(GST_ELEMENT(divxenc),
+                      "Error setting up divx encoder: %s (%d)",
+                      gst_divxenc_error(ret), ret);
     return FALSE;
   }
 
@@ -364,10 +363,9 @@ gst_divxenc_chain (GstPad    *pad,
 
   if ((ret = encore(divxenc->handle, ENC_OPT_ENCODE,
                     &xframe, &xres))) {
-    gst_element_gerror(GST_ELEMENT(divxenc), GST_ERROR_UNKNOWN,
-      g_strdup ("unconverted error, file a bug"),
-      g_strdup_printf("Error encoding divx frame: %s (%d)",
-                      gst_divxenc_error(ret), ret));
+    gst_element_error(GST_ELEMENT(divxenc),
+                      "Error encoding divx frame: %s (%d)",
+                      gst_divxenc_error(ret), ret);
     gst_buffer_unref(buf);
     return;
   }