diff options
| author | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-03-01 14:29:50 +0400 |
|---|---|---|
| committer | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-03-01 14:29:50 +0400 |
| commit | f189f62b139a5d95b6ad9093566fed09093e1879 (patch) | |
| tree | cbef8f2507ef138434bce93f44e6c082ec290d12 /tests/check/elements/interleave.c | |
| parent | 9f4fb6feb9635695d3345f6f03319004c7210fe4 (diff) | |
| parent | 50cd7c9ac6f2d64d8b43e03f2b248efa02dafe4c (diff) | |
Merge branch 'master' into 0.11
Conflicts:
ext/wavpack/gstwavpackenc.c
tests/check/elements/audioiirfilter.c
tests/examples/v4l2/probe.c
Diffstat (limited to 'tests/check/elements/interleave.c')
| -rw-r--r-- | tests/check/elements/interleave.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/check/elements/interleave.c b/tests/check/elements/interleave.c index e456a3e25..6f2d51f40 100644 --- a/tests/check/elements/interleave.c +++ b/tests/check/elements/interleave.c @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +/* FIXME 0.11: suppress warnings for deprecated API such as GValueArray + * with newer GLib versions (>= 2.31.0) */ +#define GLIB_DISABLE_DEPRECATION_WARNINGS + #ifdef HAVE_CONFIG_H # include "config.h" #endif |