summaryrefslogtreecommitdiffstats
path: root/ext/xvid
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2003-09-16 10:00:00 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2003-09-16 10:00:00 +0000
commit671eef9b9d7116af3fc41e4b6838dffb56b45c77 (patch)
treeb23179bec589972c4cb162963911bef4e237a8e1 /ext/xvid
parent054bbacfab1adbf6934dce52bee844f2950d3f64 (diff)
downloadgst-plugins-bad-671eef9b9d7116af3fc41e4b6838dffb56b45c77.tar.gz
gst-plugins-bad-671eef9b9d7116af3fc41e4b6838dffb56b45c77.tar.bz2
gst-plugins-bad-671eef9b9d7116af3fc41e4b6838dffb56b45c77.zip
reverting error patch before making a branch.BRANCH-ERROR-ROOTBRANCH-ERROR
Original commit message from CVS: reverting error patch before making a branch.
Diffstat (limited to 'ext/xvid')
-rw-r--r--ext/xvid/gstxviddec.c19
-rw-r--r--ext/xvid/gstxvidenc.c14
2 files changed, 14 insertions, 19 deletions
diff --git a/ext/xvid/gstxviddec.c b/ext/xvid/gstxviddec.c
index 5bdcea34..50e72a3c 100644
--- a/ext/xvid/gstxviddec.c
+++ b/ext/xvid/gstxviddec.c
@@ -192,11 +192,10 @@ gst_xviddec_setup (GstXvidDec *xviddec)
if ((ret = xvid_decore(NULL, XVID_DEC_CREATE,
&xdec, NULL)) != XVID_ERR_OK) {
- gst_element_gerror(GST_ELEMENT(xviddec), GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf("Setting parameters %dx%d@%d failed: %s (%d)",
+ gst_element_error(GST_ELEMENT(xviddec),
+ "Setting parameters %dx%d@%d failed: %s (%d)",
xviddec->width, xviddec->height, xviddec->csp,
- gst_xvid_error(ret), ret));
+ gst_xvid_error(ret), ret);
return FALSE;
}
@@ -232,9 +231,8 @@ gst_xviddec_chain (GstPad *pad,
if (!xviddec->handle) {
if (!gst_xviddec_negotiate(xviddec)) {
- gst_element_gerror(GST_ELEMENT(xviddec), GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf("No format set - aborting"));
+ gst_element_error(GST_ELEMENT(xviddec),
+ "No format set - aborting");
gst_buffer_unref(buf);
return;
}
@@ -257,10 +255,9 @@ gst_xviddec_chain (GstPad *pad,
if ((ret = xvid_decore(xviddec->handle, XVID_DEC_DECODE,
&xframe, NULL))) {
- gst_element_gerror(GST_ELEMENT(xviddec), GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf("Error decoding xvid frame: %s (%d)\n",
- gst_xvid_error(ret), ret));
+ gst_element_error(GST_ELEMENT(xviddec),
+ "Error decoding xvid frame: %s (%d)\n",
+ gst_xvid_error(ret), ret);
gst_buffer_unref(buf);
return;
}
diff --git a/ext/xvid/gstxvidenc.c b/ext/xvid/gstxvidenc.c
index 7561848f..b217b652 100644
--- a/ext/xvid/gstxvidenc.c
+++ b/ext/xvid/gstxvidenc.c
@@ -237,10 +237,9 @@ gst_xvidenc_setup (GstXvidEnc *xvidenc)
if ((ret = xvid_encore(NULL, XVID_ENC_CREATE,
&xenc, NULL)) != XVID_ERR_OK) {
- gst_element_gerror(GST_ELEMENT(xvidenc), GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf("Error setting up xvid encoder: %s (%d)",
- gst_xvid_error(ret), ret));
+ gst_element_error(GST_ELEMENT(xvidenc),
+ "Error setting up xvid encoder: %s (%d)",
+ gst_xvid_error(ret), ret);
return FALSE;
}
@@ -286,10 +285,9 @@ gst_xvidenc_chain (GstPad *pad,
if ((ret = xvid_encore(xvidenc->handle, XVID_ENC_ENCODE,
&xframe, NULL)) != XVID_ERR_OK) {
- gst_element_gerror(GST_ELEMENT(xvidenc), GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf("Error encoding xvid frame: %s (%d)",
- gst_xvid_error(ret), ret));
+ gst_element_error(GST_ELEMENT(xvidenc),
+ "Error encoding xvid frame: %s (%d)",
+ gst_xvid_error(ret), ret);
gst_buffer_unref(buf);
return;
}