projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c974df1
)
qtdemux: Fix crash with no cenc aux offset
author
Xabier Rodriguez Calvar
<calvaris@igalia.com>
Tue, 6 Sep 2016 07:49:39 +0000
(09:49 +0200)
committer
Sebastian Dröge
<sebastian@centricular.com>
Wed, 7 Sep 2016 06:58:22 +0000
(09:58 +0300)
https://bugzilla.gnome.org/show_bug.cgi?id=770951
gst/isomp4/qtdemux.c
patch
|
blob
|
history
diff --git
a/gst/isomp4/qtdemux.c
b/gst/isomp4/qtdemux.c
index
9768cc9
..
f68723e
100644
(file)
--- a/
gst/isomp4/qtdemux.c
+++ b/
gst/isomp4/qtdemux.c
@@
-5304,7
+5304,7
@@
gst_qtdemux_decorate_and_push_buffer (GstQTDemux * qtdemux,
gst_pad_push_event (stream->pad, event);
}
- if (qtdemux->cenc_aux_info_offset
> 0 &&
info->crypto_info == NULL) {
+ if (qtdemux->cenc_aux_info_offset
== 0 ||
info->crypto_info == NULL) {
GST_DEBUG_OBJECT (qtdemux, "cenc metadata hasn't been parsed yet");
gst_buffer_unref (buf);
goto exit;