summaryrefslogtreecommitdiffstats
path: root/gst/avi
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2003-09-16 10:00:02 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2003-09-16 10:00:02 +0000
commit54b0fe0f9472e1e6554dba0b9697151a9ef319a3 (patch)
tree2f0cb83625c9c8332600418933f0b6690fd6869e /gst/avi
parent8817348af768345a644ed05f621f1b5392f325a0 (diff)
reverting error patch before making a branch.
Original commit message from CVS: reverting error patch before making a branch.
Diffstat (limited to 'gst/avi')
-rw-r--r--gst/avi/gstavidemux.c4
-rw-r--r--gst/avi/gstavimux.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index e79d707e..ed605935 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -1691,9 +1691,7 @@ gst_avi_demux_loop (GstElement *element)
case GST_AVI_DEMUX_START:
if (chunk.id != GST_RIFF_TAG_RIFF &&
chunk.type != GST_RIFF_RIFF_AVI) {
- gst_element_gerror(element, GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup_printf("This doesn't appear to be an AVI file %08x %08x", chunk.id, chunk.type));
+ gst_element_error (element, "This doesn't appear to be an AVI file %08x %08x", chunk.id, chunk.type);
return;
}
avi_demux->state = GST_AVI_DEMUX_HEADER;
diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index 68105d91..4a980a13 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -1062,9 +1062,7 @@ gst_avimux_stop_file (GstAviMux *avimux)
if (avimux->audio_time) {
avimux->auds_hdr.rate = (GST_SECOND * avimux->audio_size) / avimux->audio_time;
} else {
- gst_element_gerror(GST_ELEMENT (avimux), GST_ERROR_UNKNOWN,
- g_strdup ("unconverted error, file a bug"),
- g_strdup ("Audio stream availablebut no audio data transferred (or data with invalid timestamps). Resulting AVI will be corrupt"));
+ gst_element_error (GST_ELEMENT (avimux), "Audio stream available, but no audio data transferred (or data with invalid timestamps). Resulting AVI will be corrupt");
avimux->auds_hdr.rate = 0;
}
avimux->auds.av_bps = avimux->auds_hdr.rate * avimux->auds_hdr.scale;