diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-03-13 19:49:36 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-03-13 19:49:36 +0000 |
| commit | c7fe9074d33850efe63469feafa188720fa8bba5 (patch) | |
| tree | d457ae00dff5c3c129ca1eb999141b600f915d15 | |
| parent | 5bc20dc242743b68d9eda29d1a65feb3428d5a53 (diff) | |
| parent | bb08fe9cf80da451c8aac0338e698e4052f748b7 (diff) | |
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
configure.ac
gnl/gnlfilesource.c
gnl/gnlsource.c
tests/check/gnl/common.h
| -rw-r--r-- | gnl/gnlobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnl/gnlobject.h b/gnl/gnlobject.h index 568b973..c5a3b2e 100644 --- a/gnl/gnlobject.h +++ b/gnl/gnlobject.h @@ -57,7 +57,7 @@ typedef enum GNL_OBJECT_OPERATION = (GST_BIN_FLAG_LAST << 1), GNL_OBJECT_EXPANDABLE = (GST_BIN_FLAG_LAST << 2), /* padding */ - GNL_OBJECT_LAST_FLAG = (GST_BIN_FLAG_LAST << 16) + GNL_OBJECT_LAST_FLAG = (GST_BIN_FLAG_LAST << 5) } GnlObjectFlags; |