platform/upstream/gstreamer.git
12 years agogst: Change versioning
Sebastian Dröge [Wed, 4 Apr 2012 11:13:52 +0000 (13:13 +0200)]
gst: Change versioning

Remove GST_MAJORMINOR and replace it by GST_API_VERSION
Also set GST_VERSION_{MAJOR,MINOR,MICRO,NANO} explicitely
now.

All versions are at 1.0.0 now for the release soon but
API/ABI can still change until the 1.0.0 release.

Next release versions until 1.0.0 will be 0.10.9X and
these will be release candidates. GST_VERSION_* will
nonetheless stay at 1.0.0.0.

12 years agoMerge remote-tracking branch 'origin/0.10'
Sebastian Dröge [Wed, 4 Apr 2012 10:25:40 +0000 (12:25 +0200)]
Merge remote-tracking branch 'origin/0.10'

Conflicts:
docs/gst/gstreamer-sections.txt
gst/Makefile.am
gst/gst.c
gst/gst.h
gst/gstevent.c
gst/gstevent.h
gst/gstmessage.c
gst/gstmessage.h
gst/gstquark.c
gst/gstquark.h
gst/gstquery.c
gst/gstquery.h
gst/gsttoc.c
gst/gsttoc.h
gst/gsttocsetter.c
tests/check/Makefile.am
tests/check/gst/gsttoc.c
tests/check/gst/gsttocsetter.c

12 years agobuffer: improve _set_size()
Wim Taymans [Tue, 3 Apr 2012 14:51:54 +0000 (16:51 +0200)]
buffer: improve _set_size()

12 years agobuffer: make get_sizes and _resize with ranges
Wim Taymans [Tue, 3 Apr 2012 14:44:58 +0000 (16:44 +0200)]
buffer: make get_sizes and _resize with ranges

Make the _get_sizes and _resize methods work on a range of memory to make them
more powerfull.

12 years agoconsistencychecker: allow some more events before a segment event
Mark Nauwelaerts [Tue, 3 Apr 2012 16:25:40 +0000 (18:25 +0200)]
consistencychecker: allow some more events before a segment event

12 years agotocsetter: use new glib mutex api
Stefan Sauer [Tue, 3 Apr 2012 13:46:29 +0000 (15:46 +0200)]
tocsetter: use new glib mutex api

12 years agotools: fix compiler warning
Tim-Philipp Müller [Mon, 2 Apr 2012 22:17:21 +0000 (23:17 +0100)]
tools: fix compiler warning

gst-launch.c: In function ‘print_toc_entry’:
gst-launch.c:446:3: error: the size of array ‘spc’ can’t be evaluated [-Werror=vla]
gst-launch.c:446:3: error: variable-sized object may not be initialized

12 years agotests: add new unit test binaries to .gitignore
Tim-Philipp Müller [Mon, 2 Apr 2012 22:29:24 +0000 (23:29 +0100)]
tests: add new unit test binaries to .gitignore

12 years agogst: ref new entry enum types
Tim-Philipp Müller [Mon, 2 Apr 2012 22:28:15 +0000 (23:28 +0100)]
gst: ref new entry enum types

Fixes 'make check', again.

12 years agowin32: add new API to .def file
Tim-Philipp Müller [Mon, 2 Apr 2012 22:24:22 +0000 (23:24 +0100)]
win32: add new API to .def file

Fixes 'make check'.

12 years agotoc: don't export private functions
Tim-Philipp Müller [Mon, 2 Apr 2012 22:23:46 +0000 (23:23 +0100)]
toc: don't export private functions

12 years agotools: fix compiler warning
Tim-Philipp Müller [Mon, 2 Apr 2012 22:17:21 +0000 (23:17 +0100)]
tools: fix compiler warning

gst-launch.c: In function ‘print_toc_entry’:
gst-launch.c:446:3: error: the size of array ‘spc’ can’t be evaluated [-Werror=vla]
gst-launch.c:446:3: error: variable-sized object may not be initialized

12 years agopo: update for new translatable strings
Tim-Philipp Müller [Mon, 2 Apr 2012 22:16:39 +0000 (23:16 +0100)]
po: update for new translatable strings

12 years agoMerge remote-tracking branch 'origin/master'
Stefan Sauer [Mon, 2 Apr 2012 21:01:17 +0000 (23:01 +0200)]
Merge remote-tracking branch 'origin/master'

12 years agotoc: port to 0.11
Stefan Sauer [Mon, 2 Apr 2012 20:09:07 +0000 (22:09 +0200)]
toc: port to 0.11

12 years agogst-launch: add -c, --toc to print the toc
Stefan Sauer [Thu, 22 Mar 2012 07:36:02 +0000 (08:36 +0100)]
gst-launch: add -c, --toc to print the toc

Print the nested chapter and edition structure of the chapters message.

12 years agodocs: add overview of GstToc usage
Alexander Saprykin [Wed, 28 Mar 2012 19:15:41 +0000 (23:15 +0400)]
docs: add overview of GstToc usage

12 years agodocs: Add GstToc and GstTocSetter sections with related functions
Alexander Saprykin [Wed, 14 Mar 2012 17:14:23 +0000 (21:14 +0400)]
docs: Add GstToc and GstTocSetter sections with related functions

12 years agogstchecks: Add unit test for the GstTocSetter
Alexander Saprykin [Wed, 14 Mar 2012 17:13:22 +0000 (21:13 +0400)]
gstchecks: Add unit test for the GstTocSetter

12 years agogstchecks: Add unit test for the GstToc
Alexander Saprykin [Wed, 14 Mar 2012 17:12:22 +0000 (21:12 +0400)]
gstchecks: Add unit test for the GstToc

12 years agoAdd new GstTocSetter interface
Alexander Saprykin [Wed, 14 Mar 2012 16:45:35 +0000 (20:45 +0400)]
Add new GstTocSetter interface

12 years agoAdd new TOC query
Alexander Saprykin [Wed, 14 Mar 2012 16:42:56 +0000 (20:42 +0400)]
Add new TOC query

12 years agoAdd new TOC message
Alexander Saprykin [Wed, 14 Mar 2012 16:41:48 +0000 (20:41 +0400)]
Add new TOC message

12 years agoAdd new TOC and TOC select events
Alexander Saprykin [Wed, 14 Mar 2012 16:40:32 +0000 (20:40 +0400)]
Add new TOC and TOC select events

12 years agoAdd generic table of contents (TOC) support
Alexander Saprykin [Wed, 14 Mar 2012 16:01:51 +0000 (20:01 +0400)]
Add generic table of contents (TOC) support

12 years agoMerge branch '0.10'
Stefan Sauer [Mon, 2 Apr 2012 19:15:09 +0000 (21:15 +0200)]
Merge branch '0.10'

Conflicts:
docs/gst/gstreamer-sections.txt
gst/Makefile.am
gst/gst.c
gst/gst.h
gst/gstevent.c
gst/gstevent.h
gst/gstmessage.h
gst/gstquark.c
gst/gstquark.h
gst/gstquery.c
gst/gstquery.h
tests/check/Makefile.am

12 years agoMerge remote-tracking branch 'origin/0.10'
Sebastian Dröge [Mon, 2 Apr 2012 13:30:04 +0000 (15:30 +0200)]
Merge remote-tracking branch 'origin/0.10'

Conflicts:
libs/gst/base/gstbaseparse.c

12 years agobaseparse: always attempt to push if not-linked
Edward Hervey [Mon, 2 Apr 2012 13:13:24 +0000 (15:13 +0200)]
baseparse: always attempt to push if not-linked

This avoids ending up with plenty of pending data (since we'll only
 try to parse/push one frame from the incoming buffer).

Fixes increasing memory consumption when parsers aren't linked

Conflicts:

libs/gst/base/gstbaseparse.c

12 years agobaseparse: always attempt to push if not-linked
Edward Hervey [Mon, 2 Apr 2012 13:13:24 +0000 (15:13 +0200)]
baseparse: always attempt to push if not-linked

This avoids ending up with plenty of pending data (since we'll only
 try to parse/push one frame from the incoming buffer).

Fixes increasing memory consumption when parsers aren't linked

12 years agoTimeout is not used on W32
Руслан Ижбулатов [Sat, 31 Mar 2012 23:30:51 +0000 (03:30 +0400)]
Timeout is not used on W32

Fixes #673267

12 years agotrans: add transform_ip_on_passthrough
Wim Taymans [Mon, 2 Apr 2012 09:09:50 +0000 (11:09 +0200)]
trans: add transform_ip_on_passthrough

Add an option to control if transform_ip is called in passthrough mode or not.
for elements that don't want to look at the data in passthrough mode, this can
avoid some extra processing, mostly in subclasses.

12 years agogst-launch: add -c, --toc to print the toc
Stefan Sauer [Thu, 22 Mar 2012 07:36:02 +0000 (08:36 +0100)]
gst-launch: add -c, --toc to print the toc

Print the nested chapter and edition structure of the chapters message.

12 years agodocs: add overview of GstToc usage
Alexander Saprykin [Wed, 28 Mar 2012 19:15:41 +0000 (23:15 +0400)]
docs: add overview of GstToc usage

12 years agodocs: Add GstToc and GstTocSetter sections with related functions
Alexander Saprykin [Wed, 14 Mar 2012 17:14:23 +0000 (21:14 +0400)]
docs: Add GstToc and GstTocSetter sections with related functions

12 years agogstchecks: Add unit test for the GstTocSetter
Alexander Saprykin [Wed, 14 Mar 2012 17:13:22 +0000 (21:13 +0400)]
gstchecks: Add unit test for the GstTocSetter

12 years agogstchecks: Add unit test for the GstToc
Alexander Saprykin [Wed, 14 Mar 2012 17:12:22 +0000 (21:12 +0400)]
gstchecks: Add unit test for the GstToc

12 years agoAdd new GstTocSetter interface
Alexander Saprykin [Wed, 14 Mar 2012 16:45:35 +0000 (20:45 +0400)]
Add new GstTocSetter interface

12 years agoAdd new TOC query
Alexander Saprykin [Wed, 14 Mar 2012 16:42:56 +0000 (20:42 +0400)]
Add new TOC query

12 years agoAdd new TOC message
Alexander Saprykin [Wed, 14 Mar 2012 16:41:48 +0000 (20:41 +0400)]
Add new TOC message

12 years agoAdd new TOC and TOC select events
Alexander Saprykin [Wed, 14 Mar 2012 16:40:32 +0000 (20:40 +0400)]
Add new TOC and TOC select events

12 years agoAdd generic table of contents (TOC) support
Alexander Saprykin [Wed, 14 Mar 2012 16:01:51 +0000 (20:01 +0400)]
Add generic table of contents (TOC) support

12 years agobuffer: reuse more code
Wim Taymans [Sun, 1 Apr 2012 10:01:34 +0000 (12:01 +0200)]
buffer: reuse more code

12 years agobuffer: make function to find memory in a buffer
Wim Taymans [Sun, 1 Apr 2012 09:42:52 +0000 (11:42 +0200)]
buffer: make function to find memory in a buffer

Make a function to find the memory blocks for a region in a buffer.

12 years agochildproxy: fix more missing GST_OBJECT -> G_OBJECT use
Stefan Sauer [Sat, 31 Mar 2012 19:26:22 +0000 (21:26 +0200)]
childproxy: fix more missing GST_OBJECT -> G_OBJECT use

12 years agoadapter: use buffer_wrap
Wim Taymans [Sat, 31 Mar 2012 16:34:23 +0000 (18:34 +0200)]
adapter: use buffer_wrap

12 years agobuffer: add peek_memory method
Wim Taymans [Sat, 31 Mar 2012 15:10:35 +0000 (17:10 +0200)]
buffer: add peek_memory method

Add a peerk_memory method that simply fetches the memory at an offset without
refcounting or merging.

12 years agogrammar.y: fix childproxy code
Wim Taymans [Sat, 31 Mar 2012 10:00:56 +0000 (12:00 +0200)]
grammar.y: fix childproxy code

It takes GObject and not GstObject now

12 years agochildproxy: include the child name in the signal
Stefan Sauer [Fri, 30 Mar 2012 20:46:02 +0000 (22:46 +0200)]
childproxy: include the child name in the signal

12 years agoparser: update for childproxy api changes
Stefan Sauer [Fri, 30 Mar 2012 20:44:31 +0000 (22:44 +0200)]
parser: update for childproxy api changes

12 years agochildproxy: fix signal parameter types
Stefan Sauer [Fri, 30 Mar 2012 20:36:35 +0000 (22:36 +0200)]
childproxy: fix signal parameter types

12 years agochildproxy: use GObject instead of GstObject
Stefan Sauer [Fri, 30 Mar 2012 20:17:09 +0000 (22:17 +0200)]
childproxy: use GObject instead of GstObject

This makes it prossible to be used more widely. Fix implementations for the API
change.

12 years agochildproxy: make get_child_by_name virtual
Stefan Sauer [Fri, 30 Mar 2012 20:01:55 +0000 (22:01 +0200)]
childproxy: make get_child_by_name virtual

Allows implementations to use custom name->object mappings.

12 years agochildproxy: fix indentation
Stefan Sauer [Fri, 30 Mar 2012 20:01:26 +0000 (22:01 +0200)]
childproxy: fix indentation

12 years agobuffer: improve the buffer memory methods
Wim Taymans [Fri, 30 Mar 2012 16:04:51 +0000 (18:04 +0200)]
buffer: improve the buffer memory methods

gst_buffer_take_memory -> gst_buffer_insert_memory because insert is what the
method does.
Make all methods deal with ranges so that we can replace, merge, remove and map
a certain subset of the memory in a buffer. With the new methods we can make
some code nicer and reuse more code. Being able to deal with a subset of the
buffer memory allows us to optimize more cases later (most notably RTP headers
and payload that could be in different memory objects).
Make some more convenient macros that call the more generic range methods.

12 years agotypefindelement: plug caps leaks
Mark Nauwelaerts [Fri, 30 Mar 2012 14:53:09 +0000 (16:53 +0200)]
typefindelement: plug caps leaks

12 years agotypefindhelper: also unmap collected mapped buffers
Mark Nauwelaerts [Fri, 30 Mar 2012 14:53:05 +0000 (16:53 +0200)]
typefindhelper: also unmap collected mapped buffers

12 years agobasetransform: plug caps leak
Mark Nauwelaerts [Fri, 30 Mar 2012 14:53:00 +0000 (16:53 +0200)]
basetransform: plug caps leak

12 years agobaseparse: Rename ::event() to ::sink_event() for consistency
Sebastian Dröge [Fri, 30 Mar 2012 09:58:20 +0000 (11:58 +0200)]
baseparse: Rename ::event() to ::sink_event() for consistency

12 years agobasesink: lower GST_BASE_SRC_FLAG_LAST
Edward Hervey [Fri, 30 Mar 2012 09:49:16 +0000 (11:49 +0200)]
basesink: lower GST_BASE_SRC_FLAG_LAST

It wouldn't leave that much room for subclass users

12 years agowin32: Update defs file
Edward Hervey [Fri, 30 Mar 2012 06:55:33 +0000 (08:55 +0200)]
win32: Update defs file

12 years agobytewriter: Actually commit the .c file changes too
Sebastian Dröge [Thu, 29 Mar 2012 16:03:35 +0000 (18:03 +0200)]
bytewriter: Actually commit the .c file changes too

12 years agobytewriter: Add unchecked/inline variant of gst_byte_writer_put_buffer()
Sebastian Dröge [Thu, 29 Mar 2012 15:59:28 +0000 (17:59 +0200)]
bytewriter: Add unchecked/inline variant of gst_byte_writer_put_buffer()

12 years agogstquery: Fix annotation
Edward Hervey [Thu, 29 Mar 2012 15:53:47 +0000 (17:53 +0200)]
gstquery: Fix annotation

12 years agoqueue: Flush the internal queue when we see GST_FLOW_FLUSHING
Edward Hervey [Thu, 29 Mar 2012 15:44:02 +0000 (17:44 +0200)]
queue: Flush the internal queue when we see GST_FLOW_FLUSHING

Ensures that we don't end up with stale contents (like GstQuery) in
the internal GQueue after any blocking upstream thread returns.

12 years agoqueue: Don't unref GstQuery travelling through the queue
Edward Hervey [Thu, 29 Mar 2012 15:43:17 +0000 (17:43 +0200)]
queue: Don't unref GstQuery travelling through the queue

Unlike events and buffers, the reference is not given to us

12 years agoquery: parsing allocation query need not provide reffed caps
Mark Nauwelaerts [Thu, 29 Mar 2012 15:08:49 +0000 (17:08 +0200)]
query: parsing allocation query need not provide reffed caps

... in line with other query parsing function.

12 years agocaps: spelling fixes
Fabrizio (Misto) Milo [Thu, 29 Mar 2012 13:45:00 +0000 (15:45 +0200)]
caps: spelling fixes

12 years agogstelement: lower GST_ELEMENT_FLAG_LAST
Edward Hervey [Thu, 29 Mar 2012 13:28:44 +0000 (15:28 +0200)]
gstelement: lower GST_ELEMENT_FLAG_LAST

It wouldn't leave that much room for subclass users

12 years agogstbuffer: Fix unitialized variable
Edward Hervey [Thu, 29 Mar 2012 13:18:33 +0000 (15:18 +0200)]
gstbuffer: Fix unitialized variable

gcc 4.5 complains otherwise :(

12 years agoMerge remote-tracking branch 'origin/0.10'
Sebastian Dröge [Thu, 29 Mar 2012 12:54:53 +0000 (14:54 +0200)]
Merge remote-tracking branch 'origin/0.10'

Conflicts:
plugins/elements/gstmultiqueue.c

12 years agomultiqueue: Wake up all not-linked streams when a stream switches from linked to...
Sebastian Dröge [Thu, 29 Mar 2012 12:45:41 +0000 (14:45 +0200)]
multiqueue: Wake up all not-linked streams when a stream switches from linked to not-linked

We reset all the waiting streams, let them push another buffer to
see if they're now active again. This allows faster switching
between streams and prevents deadlocks if downstream does any
waiting too.

Also improve locking a bit, srcresult must be protected by the
multiqueue lock too because it's used/set from random threads.

12 years agomultiqueue: Recompute high-time too when flushing, not only high-id
Sebastian Dröge [Thu, 29 Mar 2012 12:32:24 +0000 (14:32 +0200)]
multiqueue: Recompute high-time too when flushing, not only high-id

12 years agoinputselector: Only wait until the active pad's running time is reached if the active...
Sebastian Dröge [Thu, 29 Mar 2012 11:39:40 +0000 (13:39 +0200)]
inputselector: Only wait until the active pad's running time is reached if the active pad already saw data

Otherwise we might block forever because upstream (e.g. multiqueue) is waiting
for the previously active stream to return forever (which is waiting here
in inputselector) before pushing something on the newly selected stream.

12 years agodocs: update more documentation
Wim Taymans [Thu, 29 Mar 2012 11:34:50 +0000 (13:34 +0200)]
docs: update more documentation

12 years agoreview some docs
Wim Taymans [Wed, 28 Mar 2012 16:12:23 +0000 (18:12 +0200)]
review some docs

12 years agobuffer: simplify and refactor _span and _merge
Wim Taymans [Wed, 28 Mar 2012 14:44:34 +0000 (16:44 +0200)]
buffer: simplify and refactor _span and _merge

Unify the _span and _merge code paths and simplify now that we only use this
internally.

12 years agobuffer: we always call _span with the buffer size
Wim Taymans [Wed, 28 Mar 2012 13:16:01 +0000 (15:16 +0200)]
buffer: we always call _span with the buffer size

12 years agobuffer: move some code around
Wim Taymans [Wed, 28 Mar 2012 13:12:05 +0000 (15:12 +0200)]
buffer: move some code around

12 years agobuffer: we call _span always with 0 offset
Wim Taymans [Wed, 28 Mar 2012 13:08:44 +0000 (15:08 +0200)]
buffer: we call _span always with 0 offset

12 years agobuffer: remove always FALSE function argument
Wim Taymans [Wed, 28 Mar 2012 11:08:59 +0000 (13:08 +0200)]
buffer: remove always FALSE function argument

12 years agobuffer: delay buffer unref until buffer no longer needed
Mark Nauwelaerts [Wed, 28 Mar 2012 14:39:54 +0000 (16:39 +0200)]
buffer: delay buffer unref until buffer no longer needed

12 years agobuffer: unify buffer merge methods
Wim Taymans [Wed, 28 Mar 2012 10:44:44 +0000 (12:44 +0200)]
buffer: unify buffer merge methods

Add gst_buffer_append() which appends the memory blocks from one buffer to
another. Remove the old inefficient _merge() and _join() methods which forced a
premature memcpy in most cases.
Remove the _is_span() and _span() methods they are not needed anymore now that
we can _append(). Merging and spanning will be delayed until mapping or maybe
not at all when the element can deal with the different memory blocks.

12 years agogstpad: Fix typo in docstring
Olivier Crête [Tue, 27 Mar 2012 19:24:49 +0000 (15:24 -0400)]
gstpad: Fix typo in docstring

12 years agogstpad: Fix typo in docstring
Olivier Crête [Tue, 27 Mar 2012 19:24:49 +0000 (15:24 -0400)]
gstpad: Fix typo in docstring

12 years agobuffer: re-enable _span offset calculations
Wim Taymans [Tue, 27 Mar 2012 13:16:55 +0000 (15:16 +0200)]
buffer: re-enable _span offset calculations

when we _span two complete buffers, we can copy offsets and timestamps.

12 years agotrace: add refcount to trace debug
Wim Taymans [Tue, 27 Mar 2012 13:00:38 +0000 (15:00 +0200)]
trace: add refcount to trace debug

12 years agobuffer: add more _is_writable checks
Wim Taymans [Tue, 27 Mar 2012 12:59:06 +0000 (14:59 +0200)]
buffer: add more _is_writable checks

Add some checks to assert on writability for functions that modify metadata.

12 years agobufferpool: remove const from get/set_param
Wim Taymans [Tue, 27 Mar 2012 10:40:36 +0000 (12:40 +0200)]
bufferpool: remove const from get/set_param

Remove the const from the GstCaps in get/set_param. set_param modifies
the refcount of the caps.
Don't increment the refcount of the caps result of get_param like we
do with other objects.
Update some annotiations.

12 years agobufferpool: fix annotation for _release
Wim Taymans [Tue, 27 Mar 2012 10:39:53 +0000 (12:39 +0200)]
bufferpool: fix annotation for _release

_release takes ownership of the buffer

12 years agobus: Change the timeout argument type of gst_bus_poll() from GstClockTimeDiff to...
Sebastian Dröge [Tue, 27 Mar 2012 10:31:18 +0000 (12:31 +0200)]
bus: Change the timeout argument type of gst_bus_poll() from GstClockTimeDiff to GstClockTime

This is more consistent with the other GstBus methods that have a timeout.

12 years agocaps: remove old code
Wim Taymans [Mon, 26 Mar 2012 17:13:21 +0000 (19:13 +0200)]
caps: remove old code

Remove attempt to delay _make_writable

12 years agocaps: ensure writable caps prior to modification
Mark Nauwelaerts [Mon, 26 Mar 2012 16:07:35 +0000 (18:07 +0200)]
caps: ensure writable caps prior to modification

12 years agobufferpool: check min/max_buffers
Wim Taymans [Mon, 26 Mar 2012 15:38:50 +0000 (17:38 +0200)]
bufferpool: check min/max_buffers

12 years agoquery:fix copy-and-paste problem
Wim Taymans [Mon, 26 Mar 2012 15:35:18 +0000 (17:35 +0200)]
query:fix copy-and-paste problem

12 years agoReplace master with 0.11
Wim Taymans [Mon, 26 Mar 2012 09:54:59 +0000 (11:54 +0200)]
Replace master with 0.11

12 years agoutils: add and improve debug messages
Mark Nauwelaerts [Fri, 23 Mar 2012 17:51:52 +0000 (18:51 +0100)]
utils: add and improve debug messages

... so they end up in a more expected debug category rather than oblivion.

12 years agoback to devel
Wim Taymans [Thu, 22 Mar 2012 14:54:55 +0000 (15:54 +0100)]
back to devel

12 years agoRelease 0.11.3
Wim Taymans [Thu, 22 Mar 2012 14:49:36 +0000 (15:49 +0100)]
Release 0.11.3

12 years agobasetransform: remove automatic and undocumented setting of always_in_place
Mark Nauwelaerts [Thu, 22 Mar 2012 14:22:57 +0000 (15:22 +0100)]
basetransform: remove automatic and undocumented setting of always_in_place

... which controls how to (forcibly) deal with (non-)writable data and
is not necessarily related to identical caps.

In particular, it is also not so helpful anymore with a more advanced
GstVideoFilter subclass which always has a transform_ip method currently,
even though its subclass may not have a corresponding _ip method.

12 years agoMerge branch 'master' into 0.11
Wim Taymans [Thu, 22 Mar 2012 09:45:06 +0000 (10:45 +0100)]
Merge branch 'master' into 0.11

Conflicts:
configure.ac