diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2013-02-28 20:02:16 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2013-02-28 20:02:16 +0000 |
| commit | 9aa78b10617ac0591a939b86657e4b8c0a9b7451 (patch) | |
| tree | 293c7f68a8338406ab73b815bc8f262a040f9d7f | |
| parent | 74ca4aeefdbd81963286b0a8d3048dc94c447f34 (diff) | |
| download | gstreamer-plugins-bad-9aa78b10617ac0591a939b86657e4b8c0a9b7451.tar.gz | |
tests: find uninstalled gst-libav plugins for unit tests
| m--------- | common | 0 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tests/check/Makefile.am | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/common b/common -Subproject 2de221ce94b657f9c9a75aa3cc0cb84dbb5da78 +Subproject ae0555868c682077488333b1ecddc443e950615 diff --git a/configure.ac b/configure.ac index 1ff3958c3..89a967dcb 100644 --- a/configure.ac +++ b/configure.ac @@ -201,7 +201,7 @@ dnl check for uninstalled plugin directories for unit tests AG_GST_CHECK_UNINSTALLED_SETUP([ AG_GST_CHECK_GST_PLUGINS_GOOD($GST_API_VERSION, [0.11.0]) AG_GST_CHECK_GST_PLUGINS_UGLY($GST_API_VERSION, [0.11.0]) - AG_GST_CHECK_GST_PLUGINS_FFMPEG($GST_API_VERSION, [0.11.0]) + AG_GST_CHECK_GST_PLUGINS_LIBAV($GST_API_VERSION, [0.11.0]) ]) dnl Check for documentation xrefs diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 822ea6dc0..6e56b2274 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -12,8 +12,8 @@ REGISTRY_ENVIRONMENT = \ TESTS_ENVIRONMENT = \ $(REGISTRY_ENVIRONMENT) \ GST_PLUGIN_SYSTEM_PATH_1_0= \ - GST_PLUGIN_PATH_1_0=$(top_builddir)/gst:$(top_builddir)/sys:$(top_builddir)/ext:$(GST_PLUGINS_FFMPEG_DIR):$(GST_PLUGINS_UGLY_DIR):$(GST_PLUGINS_GOOD_DIR):$(GST_PLUGINS_BASE_DIR):$(GST_PLUGINS_DIR) \ - GST_PLUGIN_LOADING_WHITELIST="gstreamer@$(GST_PLUGINS_DIR):gst-plugins-base@$(GSTPB_PLUGINS_DIR):gst-plugins-good:gst-plugins-ugly:gst-ffmpeg:gst-plugins-bad@$(top_builddir)" \ + GST_PLUGIN_PATH_1_0=$(top_builddir)/gst:$(top_builddir)/sys:$(top_builddir)/ext:$(GST_PLUGINS_LIBAV_DIR):$(GST_PLUGINS_UGLY_DIR):$(GST_PLUGINS_GOOD_DIR):$(GST_PLUGINS_BASE_DIR):$(GST_PLUGINS_DIR) \ + GST_PLUGIN_LOADING_WHITELIST="gstreamer@$(GST_PLUGINS_DIR):gst-plugins-base@$(GSTPB_PLUGINS_DIR):gst-plugins-good:gst-plugins-ugly:gst-libav:gst-plugins-bad@$(top_builddir)" \ GST_STATE_IGNORE_ELEMENTS="apexsink camerabin cdaudio dc1394src \ dccpclientsrc dccpclientsink dccpserversrc dccpserversink decklinksrc \ decklinksink dvbsrc dvbbasebin dfbvideosink festival gsettingsvideosrc \ |