ext/divx/: Fix for new error system.

Original commit message from CVS:
2004-01-20  Ronald Bultje  <rbultje@ronald.bitfreak.net>

* ext/divx/gstdivxdec.c: (gst_divxdec_setup), (gst_divxdec_chain):
* ext/divx/gstdivxenc.c: (gst_divxenc_setup), (gst_divxenc_chain):
Fix for new error system.

diff --git a/ChangeLog b/ChangeLog
index 7356fb3..973f7e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-20  Ronald Bultje  <rbultje@ronald.bitfreak.net>
+
+       * ext/divx/gstdivxdec.c: (gst_divxdec_setup), (gst_divxdec_chain):
+       * ext/divx/gstdivxenc.c: (gst_divxenc_setup), (gst_divxenc_chain):
+         Fix for new error system.
+
 2004-01-20  Thomas Vander Stichele  <thomas at apestaart dot org>
 
        * ext/divx/gstdivxenc.c: (gst_divxenc_setup), (gst_divxenc_chain):

diff --git a/ext/divx/gstdivxdec.c b/ext/divx/gstdivxdec.c
index 06b3dc3..1f3e68f 100644 (file)
--- a/ext/divx/gstdivxdec.c
+++ b/ext/divx/gstdivxdec.c
@@ -234,7 +234,8 @@ gst_divxdec_setup (GstDivxDec *divxdec)
   if ((ret = decore(divxdec->handle, DEC_OPT_SETOUT,
                     &output, NULL)) != 0) {
     gst_element_error (divxdec, LIBRARY, SETTINGS, NULL,
-                       ("error setting output: %s (%d)", gst_divxdec_error (ret)), ret);
+                       ("error setting output: %s (%d)",
+                        gst_divxdec_error (ret), ret));
     gst_divxdec_unset(divxdec);
     return FALSE;
   }
@@ -270,7 +271,7 @@ gst_divxdec_chain (GstPad    *pad,
 
   if (!divxdec->handle) {
     if (gst_divxdec_negotiate(divxdec) <= 0) {
-      gst_element_error (divxdec, CORE, TOO_LAZY,
+      gst_element_error (divxdec, CORE, TOO_LAZY, NULL,
                         ("No format set - aborting"));
       gst_buffer_unref(buf);
       return;

diff --git a/ext/divx/gstdivxenc.c b/ext/divx/gstdivxenc.c
index 64ba60a..1eaaebe 100644 (file)
--- a/ext/divx/gstdivxenc.c
+++ b/ext/divx/gstdivxenc.c
@@ -295,7 +295,7 @@ gst_divxenc_setup (GstDivxEnc *divxenc)
   output.temporal_level = 1.0;
 
   if ((ret = encore(&handle, ENC_OPT_INIT, &input, &output))) {
-    gst_element_error (divxenc, LIBRARY, INIT, NULL,
+    gst_element_error (divxenc, LIBRARY, SETTINGS, NULL,
                        ("Error setting up divx encoder: %s (%d)",
                         gst_divxenc_error(ret), ret));
     return FALSE;