mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-29 15:22:17 +00:00
merge from HEAD
Original commit message from CVS: merge from HEAD
This commit is contained in:
parent
094bcaae89
commit
0766774fd7
3 changed files with 6 additions and 6 deletions
|
@ -10,7 +10,6 @@
|
||||||
#define GST_DISABLE_LOADSAVE_REGISTRY 1
|
#define GST_DISABLE_LOADSAVE_REGISTRY 1
|
||||||
#define GST_DISABLE_GST_DEBUG 1
|
#define GST_DISABLE_GST_DEBUG 1
|
||||||
#define GST_DISABLE_LOADSAVE 1
|
#define GST_DISABLE_LOADSAVE 1
|
||||||
#define GST_DISABLE_AUTOPLUG 1
|
|
||||||
#define GST_DISABLE_PARSE 1
|
#define GST_DISABLE_PARSE 1
|
||||||
#define GST_DISABLE_TRACE 1
|
#define GST_DISABLE_TRACE 1
|
||||||
#define GST_DISABLE_ALLOC_TRACE 1
|
#define GST_DISABLE_ALLOC_TRACE 1
|
||||||
|
@ -30,9 +29,6 @@
|
||||||
/* DOES NOT WORK */
|
/* DOES NOT WORK */
|
||||||
@GST_DISABLE_LOADSAVE_DEFINE@
|
@GST_DISABLE_LOADSAVE_DEFINE@
|
||||||
|
|
||||||
/* DOES NOT WORK */
|
|
||||||
@GST_DISABLE_AUTOPLUG_DEFINE@
|
|
||||||
|
|
||||||
/* DOES NOT WORK */
|
/* DOES NOT WORK */
|
||||||
@GST_DISABLE_PARSE_DEFINE@
|
@GST_DISABLE_PARSE_DEFINE@
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
include ../Rules
|
include ../Rules
|
||||||
|
|
||||||
tests_pass = commandline category global output
|
tests_pass = commandline category global
|
||||||
tests_fail =
|
tests_fail =
|
||||||
|
|
||||||
|
tests_inconsistent = global
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
include ../Rules
|
include ../Rules
|
||||||
|
|
||||||
tests_pass = commandline category global output
|
tests_pass = commandline category global
|
||||||
tests_fail =
|
tests_fail =
|
||||||
|
|
||||||
|
tests_inconsistent = global
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue