ffmpeg | branch: master | Derek Buitenhuis <[email protected]> | Sun Apr 17 19:37:54 2016 +0100| [9b36f446acbfa8322185b7af673f7a40a6d9095f] | committer: Derek Buitenhuis
Merge commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4' * commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4': timefilter-test: Only compile timefilter-test if JACK is enabled Merged-by: Derek Buitenhuis <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b36f446acbfa8322185b7af673f7a40a6d9095f --- libavdevice/Makefile | 2 +- tests/fate/libavdevice.mak | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 8394e87..7e5bf4f 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 cb6af51..b30ae99 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 ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
