diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-09-06 16:06:25 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-09-06 16:06:25 +0200 |
| commit | 33f18b8ea49f58367402abb9099abaa03b34f93c (patch) | |
| tree | 393c12538093cee0cc185627ab582f0f5d71c748 /gst/isomp4/qtdemux.h | |
| parent | e204c5934c35e5af1be7afb70477f10a7b0cc2ac (diff) | |
| parent | 7b592ff1265210cf3d74e2181664d269df7064e0 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
gst/audioparsers/gstamrparse.c
gst/isomp4/qtdemux.c
Diffstat (limited to 'gst/isomp4/qtdemux.h')
| -rw-r--r-- | gst/isomp4/qtdemux.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gst/isomp4/qtdemux.h b/gst/isomp4/qtdemux.h index 6967cfbdd..17fe8817b 100644 --- a/gst/isomp4/qtdemux.h +++ b/gst/isomp4/qtdemux.h @@ -108,6 +108,9 @@ struct _GstQTDemux { gint64 requested_seek_time; guint64 seek_offset; + + gboolean upstream_seekable; + gboolean upstream_size; }; struct _GstQTDemuxClass { |