summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2013-09-25 12:55:21 +0200
committerSebastian Dröge <slomo@circular-chaos.org>2013-09-25 13:25:34 +0200
commit4a91a93d4e651210e7d56dc188184d2ea08d2645 (patch)
tree7b9c94f55e772cc32b11c6c1b02e15161e06f4b6
parent97f46746557ee965d33dcb4cdfdf5fc0615676f5 (diff)
qtmux: Don't error out if downstream is not seekable for non-fragmented variants
Doing so would be a regression over 1.0 and breaks the unit test. However the result will be most likely unusable, so let's post a warning message on the bus.
-rw-r--r--gst/isomp4/gstqtmux.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/gst/isomp4/gstqtmux.c b/gst/isomp4/gstqtmux.c
index 58533a455..3231963bd 100644
--- a/gst/isomp4/gstqtmux.c
+++ b/gst/isomp4/gstqtmux.c
@@ -1653,7 +1653,11 @@ gst_qt_mux_start_file (GstQTMux * qtmux)
if (!seekable) {
if (qtmux_klass->format != GST_QT_MUX_FORMAT_ISML) {
if (!qtmux->fast_start) {
- goto not_seekable_error;
+ GST_ELEMENT_WARNING (qtmux, STREAM, FAILED,
+ ("Downstream is not seekable and headers can't be rewritten"),
+ (NULL));
+ /* FIXME: Is there something better we can do? */
+ qtmux->streamable = TRUE;
}
} else {
GST_WARNING_OBJECT (qtmux, "downstream is not seekable, but "
@@ -1774,15 +1778,6 @@ gst_qt_mux_start_file (GstQTMux * qtmux)
exit:
return ret;
-not_seekable_error:
- {
- GST_ELEMENT_ERROR (qtmux, STREAM, FAILED,
- ("Downstream is not seekable and headers can't be rewritten"),
- GST_ERROR_SYSTEM);
- GST_OBJECT_UNLOCK (qtmux);
- return GST_FLOW_ERROR;
- }
-
/* ERRORS */
open_failed:
{