summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivia Nikolaidou <vivia@ahiru.eu>2017-05-16 12:56:15 +0300
committerSebastian Dröge <sebastian@centricular.com>2017-05-29 10:46:53 +0300
commit0ea5c92ba6e44658e318d80337406b47edc3fbe6 (patch)
tree6cc795e1faf55154793fd3e224770ee6df560da0
parentbc269e605ca88503b08af39aaf8f74d5b04fa2c7 (diff)
qtmux: Do not check timecode data for mp4 container1.12
Timecode trak is only supported for mov right now, not for mp4. That code would otherwise create an invalid trak if the muxed video contained timecode metadata. https://bugzilla.gnome.org/show_bug.cgi?id=782684
-rw-r--r--gst/isomp4/gstqtmux.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/gst/isomp4/gstqtmux.c b/gst/isomp4/gstqtmux.c
index a63503664..c0c560827 100644
--- a/gst/isomp4/gstqtmux.c
+++ b/gst/isomp4/gstqtmux.c
@@ -2599,6 +2599,10 @@ gst_qt_mux_update_timecode (GstQTMux * qtmux, GstQTPad * qtpad)
GstBuffer *buf;
GstMapInfo map;
guint64 offset = qtpad->tc_pos;
+ GstQTMuxClass *qtmux_klass = (GstQTMuxClass *) (G_OBJECT_GET_CLASS (qtmux));
+
+ if (qtmux_klass->format != GST_QT_MUX_FORMAT_QT)
+ return GST_FLOW_OK;
g_assert (qtpad->tc_pos != -1);
@@ -3112,6 +3116,10 @@ gst_qt_mux_check_and_update_timecode (GstQTMux * qtmux, GstQTPad * pad,
GstBuffer *tc_buf;
gsize szret;
guint32 frames_since_daily_jam;
+ GstQTMuxClass *qtmux_klass = (GstQTMuxClass *) (G_OBJECT_GET_CLASS (qtmux));
+
+ if (qtmux_klass->format != GST_QT_MUX_FORMAT_QT)
+ return ret;
if (buf == NULL || (pad->tc_trak != NULL && pad->tc_pos == -1))
return ret;