summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2006-03-03 11:07:41 +0000
committerEdward Hervey <bilboed@bilboed.com>2006-03-03 11:07:41 +0000
commit28901daf9a9cf2722a3fc4ea5e56439fda6153b6 (patch)
treeec8595f2b8b9ff73f6501f1998a2d59006eb1108
parent46369006eb1a1e28fc7bb340cc866929aeb39598 (diff)
downloadgst-plugins-bad-28901daf9a9cf2722a3fc4ea5e56439fda6153b6.tar.gz
gst-plugins-bad-28901daf9a9cf2722a3fc4ea5e56439fda6153b6.tar.bz2
gst-plugins-bad-28901daf9a9cf2722a3fc4ea5e56439fda6153b6.zip
gst/qtdemux/qtdemux.c: Use GST_WARNING instead of GST_ERROR for all the too short/long atoms when parsing.
Original commit message from CVS: * gst/qtdemux/qtdemux.c: (qtdemux_parse), (qtdemux_parse_trak): Use GST_WARNING instead of GST_ERROR for all the too short/long atoms when parsing. Also let's be a bit less vulgar in our warning messages :)
-rw-r--r--ChangeLog7
-rw-r--r--gst/qtdemux/qtdemux.c28
2 files changed, 21 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index f8e28bb1..e88b100d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-03 Edward Hervey <edward@fluendo.com>
+
+ * gst/qtdemux/qtdemux.c: (qtdemux_parse), (qtdemux_parse_trak):
+ Use GST_WARNING instead of GST_ERROR for all the too short/long atoms
+ when parsing.
+ Also let's be a bit less vulgar in our warning messages :)
+
2006-02-28 Tim-Philipp Müller <tim at centricular dot net>
* gst/qtdemux/qtdemux.c: (qtdemux_parse_trak):
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index c1c01824..1842be8a 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -1064,7 +1064,7 @@ gst_qtdemux_chain (GstPad * sinkpad, GstBuffer * inbuf)
}
if (stream == NULL) {
- GST_WARNING_OBJECT (demux, "WHAT THE FUCK ?");
+ GST_WARNING_OBJECT (demux, "No stream found.");
ret = GST_FLOW_ERROR;
break;
}
@@ -1562,11 +1562,11 @@ qtdemux_parse (GstQTDemux * qtdemux, GNode * node, void *buffer, int length)
}
len = QTDEMUX_GUINT32_GET (buf);
if (len < 8) {
- GST_ERROR ("atom length too short (%d < 8)", len);
+ GST_WARNING ("atom length too short (%d < 8)", len);
break;
}
if (len > (end - buf)) {
- GST_ERROR ("atom length too long (%d > %d)", len, end - buf);
+ GST_WARNING ("atom length too long (%d > %d)", len, end - buf);
break;
}
@@ -1594,11 +1594,11 @@ qtdemux_parse (GstQTDemux * qtdemux, GNode * node, void *buffer, int length)
}
len = QTDEMUX_GUINT32_GET (buf);
if (len < 8) {
- GST_ERROR ("length too short (%d < 8)");
+ GST_WARNING ("length too short (%d < 8)");
break;
}
if (len > (end - buf)) {
- GST_ERROR ("length too long (%d > %d)", len, end - buf);
+ GST_WARNING ("length too long (%d > %d)", len, end - buf);
break;
}
@@ -1627,11 +1627,11 @@ qtdemux_parse (GstQTDemux * qtdemux, GNode * node, void *buffer, int length)
}
len = QTDEMUX_GUINT32_GET (buf);
if (len < 8) {
- GST_ERROR ("length too short (%d < 8)");
+ GST_WARNING ("length too short (%d < 8)");
break;
}
if (len > (end - buf)) {
- GST_ERROR ("length too long (%d > %d)", len, end - buf);
+ GST_WARNING ("length too long (%d > %d)", len, end - buf);
break;
}
@@ -1680,11 +1680,11 @@ qtdemux_parse (GstQTDemux * qtdemux, GNode * node, void *buffer, int length)
if (len == 0)
break;
if (len < 8) {
- GST_ERROR ("length too short (%d < 8)");
+ GST_WARNING ("length too short (%d < 8)");
break;
}
if (len > (end - buf)) {
- GST_ERROR ("length too long (%d > %d)", len, end - buf);
+ GST_WARNING ("length too long (%d > %d)", len, end - buf);
break;
}
@@ -1710,11 +1710,11 @@ qtdemux_parse (GstQTDemux * qtdemux, GNode * node, void *buffer, int length)
}
len = QTDEMUX_GUINT32_GET (buf);
if (len < 8) {
- GST_ERROR ("length too short (%d < 8)");
+ GST_WARNING ("length too short (%d < 8)");
break;
}
if (len > (end - buf)) {
- GST_ERROR ("length too long (%d > %d)", len, end - buf);
+ GST_WARNING ("length too long (%d > %d)", len, end - buf);
break;
}
@@ -1759,11 +1759,11 @@ qtdemux_parse (GstQTDemux * qtdemux, GNode * node, void *buffer, int length)
if (len == 0)
break;
if (len < 8) {
- GST_ERROR ("length too short (%d < 8)");
+ GST_WARNING ("length too short (%d < 8)");
break;
}
if (len > (end - buf)) {
- GST_ERROR ("length too long (%d > %d)", len, end - buf);
+ GST_WARNING ("length too long (%d > %d)", len, end - buf);
break;
}
@@ -2591,7 +2591,7 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
stream->compression = 320;
}
} else {
- GST_ERROR ("unknown version %08x", version);
+ GST_WARNING ("unknown version %08x", version);
}
stream->caps = qtdemux_audio_caps (qtdemux, stream, fourcc, NULL, 0,