diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:37:54 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:37:54 +0100 |
| commit | 9b36f446acbfa8322185b7af673f7a40a6d9095f (patch) | |
| tree | d651e1980d308bc58d41a48ea982cb31fcd54f2f | |
| parent | b0c75963c87defa2c31661af23860854dfe15b4c (diff) | |
| parent | 30e9ef21cea09fa5e880e979c9f5b39edccbb6f4 (diff) | |
| download | ffmpeg-9b36f446acbfa8322185b7af673f7a40a6d9095f.tar.gz | |
Merge commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4'
* commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4':
timefilter-test: Only compile timefilter-test if JACK is enabled
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | libavdevice/Makefile | 2 | ||||
| -rw-r--r-- | tests/fate/libavdevice.mak | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 8394e871ec..7e5bf4f51d 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -70,4 +70,4 @@ SKIPHEADERS-$(CONFIG_V4L2_OUTDEV) += v4l2-common.h SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa.h SKIPHEADERS-$(HAVE_SNDIO_H) += sndio.h -TESTPROGS = timefilter +TESTPROGS-$(CONFIG_JACK_INDEV) += timefilter diff --git a/tests/fate/libavdevice.mak b/tests/fate/libavdevice.mak index cb6af5162f..b30ae99779 100644 --- a/tests/fate/libavdevice.mak +++ b/tests/fate/libavdevice.mak @@ -1,4 +1,4 @@ -FATE_LIBAVDEVICE-yes += fate-timefilter +FATE_LIBAVDEVICE-$(CONFIG_JACK_INDEV) += fate-timefilter fate-timefilter: libavdevice/timefilter-test$(EXESUF) fate-timefilter: CMD = run libavdevice/timefilter-test |