diff options
Diffstat (limited to 'gst/avi')
| -rw-r--r-- | gst/avi/gstavidemux.c | 24 | ||||
| -rw-r--r-- | gst/avi/gstavimux.c | 4 |
2 files changed, 15 insertions, 13 deletions
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 2f4aebf7..882e0d70 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -686,7 +686,7 @@ gst_avi_demux_stream_init (GstAviDemux *avi) if (!gst_riff_read_header (riff, &doctype)) return FALSE; if (doctype != GST_RIFF_RIFF_AVI) { - gst_element_error (GST_ELEMENT (avi), "Not an AVI file"); + gst_element_error (avi, STREAM, WRONG_TYPE, NULL, NULL); return FALSE; } @@ -804,8 +804,8 @@ gst_avi_demux_add_stream (GstAviDemux *avi) if (!(tag = gst_riff_peek_tag (riff, NULL))) return FALSE; if (tag != GST_RIFF_TAG_strf) { - gst_element_error (GST_ELEMENT (avi), - "Invalid AVI header (no strf as second tag)"); + gst_element_error (avi, STREAM, DEMUX, NULL, + ("Invalid AVI header (no strf as second tag)")); goto skip_stream; } switch (strh->type) { @@ -1162,17 +1162,17 @@ gst_avi_demux_stream_header (GstAviDemux *avi) if (!(tag = gst_riff_peek_tag (riff, NULL))) return FALSE; if (tag != GST_RIFF_TAG_LIST) { - gst_element_error (GST_ELEMENT (avi), - "Invalid AVI header (no LIST at start): " - GST_FOURCC_FORMAT, GST_FOURCC_ARGS (tag)); + gst_element_error (avi, STREAM, DEMUX, NULL, + ("Invalid AVI header (no LIST at start): " + GST_FOURCC_FORMAT, GST_FOURCC_ARGS (tag))); return FALSE; } if (!gst_riff_read_list (riff, &tag)) return FALSE; if (tag != GST_RIFF_LIST_hdrl) { - gst_element_error (GST_ELEMENT (avi), - "Invalid AVI header (no hdrl at start): " - GST_FOURCC_FORMAT, GST_FOURCC_ARGS (tag)); + gst_element_error (avi, STREAM, DEMUX, NULL, + ("Invalid AVI header (no hdrl at start): " + GST_FOURCC_FORMAT, GST_FOURCC_ARGS (tag))); return FALSE; } @@ -1180,9 +1180,9 @@ gst_avi_demux_stream_header (GstAviDemux *avi) if (!(tag = gst_riff_peek_tag (riff, NULL))) return FALSE; if (tag != GST_RIFF_TAG_avih) { - gst_element_error (GST_ELEMENT (avi), - "Invalid AVI header (no avih at start): " - GST_FOURCC_FORMAT, GST_FOURCC_ARGS (tag)); + gst_element_error (avi, STREAM, DEMUX, NULL, + ("Invalid AVI header (no avih at start): " + GST_FOURCC_FORMAT, GST_FOURCC_ARGS (tag))); return FALSE; } if (!gst_avi_demux_stream_avih (avi, &flags, &streams)) diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index 0a2cba6c..d4acc2b5 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -29,6 +29,7 @@ #include "config.h" #endif +#include "gst-libs/gst/gst-i18n-plugin.h" #include <stdlib.h> #include <string.h> @@ -984,7 +985,8 @@ 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_error (GST_ELEMENT (avimux), "Audio stream available, but no audio data transferred (or data with invalid timestamps). Resulting AVI will be corrupt"); + gst_element_error (avimux, STREAM, MUX, + (_("No or invalid input audio, AVI stream will be corrupt")), NULL); avimux->auds_hdr.rate = 0; } avimux->auds.av_bps = avimux->auds_hdr.rate * avimux->auds_hdr.scale; |