projects
/
platform
/
upstream
/
gst-plugins-good.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2967839
)
matroskademux: Return FALSE from TOC query if no TOC exists instead of an empty TOC
author
Anton Belka
<antonbelka@gmail.com>
Thu, 21 Jun 2012 14:15:11 +0000
(17:15 +0300)
committer
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Mon, 25 Jun 2012 07:47:59 +0000
(09:47 +0200)
gst/matroska/matroska-demux.c
patch
|
blob
|
history
diff --git
a/gst/matroska/matroska-demux.c
b/gst/matroska/matroska-demux.c
index bfdbbb458807763da1c96cddc4fcc07f4ebd9be4..78cb2f676ce391332806e418ba7fdc820fd6d56a 100644
(file)
--- a/
gst/matroska/matroska-demux.c
+++ b/
gst/matroska/matroska-demux.c
@@
-1433,17
+1433,16
@@
gst_matroska_demux_query (GstMatroskaDemux * demux, GstPad * pad,
case GST_QUERY_TOC:
{
- GstToc *toc;
+ GstToc *toc
= NULL
;
GST_OBJECT_LOCK (demux);
- if (demux->common.toc)
+ if (demux->common.toc)
{
toc = demux->common.toc;
- else
- toc = gst_toc_new ();
+ res = TRUE;
+ } else {
+ res = FALSE;
+ }
gst_query_set_toc (query, toc, 0);
- res = TRUE;
- if (!demux->common.toc)
- gst_toc_unref (toc);
GST_OBJECT_UNLOCK (demux);
break;
}