ffmpeg | branch: master | Derek Buitenhuis <derek.buitenh...@gmail.com> | Sun May 8 22:53:50 2016 +0100| [f93c409c0b71d6353129fef3e85f89373d19d4d5] | committer: Derek Buitenhuis
Merge commit '44f05f15d4a34ef2f0d62259e5d5b43371bc0954' * commit '44f05f15d4a34ef2f0d62259e5d5b43371bc0954': build: Do not check the vaapi_encode.h header if VAAPI is not enabled Merged-by: Derek Buitenhuis <derek.buitenh...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f93c409c0b71d6353129fef3e85f89373d19d4d5 --- libavcodec/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b502e06..e6ca502 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -983,7 +983,7 @@ SKIPHEADERS-$(CONFIG_QSV) += qsv.h qsv_internal.h SKIPHEADERS-$(CONFIG_QSVDEC) += qsvdec.h SKIPHEADERS-$(CONFIG_QSVENC) += qsvenc.h SKIPHEADERS-$(CONFIG_XVMC) += xvmc.h -SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h +SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_encode.h vaapi_internal.h SKIPHEADERS-$(CONFIG_VDA) += vda.h vda_vt_internal.h SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.h vda_vt_internal.h ====================================================================== diff --cc libavcodec/Makefile index b502e06,22279fb..e6ca502 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@@ -982,27 -780,15 +982,27 @@@ SKIPHEADERS-$(CONFIG_MEDIACODEC) SKIPHEADERS-$(CONFIG_QSV) += qsv.h qsv_internal.h SKIPHEADERS-$(CONFIG_QSVDEC) += qsvdec.h SKIPHEADERS-$(CONFIG_QSVENC) += qsvenc.h +SKIPHEADERS-$(CONFIG_XVMC) += xvmc.h - SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h + SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_encode.h vaapi_internal.h -SKIPHEADERS-$(CONFIG_VDA) += vda.h vda_internal.h +SKIPHEADERS-$(CONFIG_VDA) += vda.h vda_vt_internal.h SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h +SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.h vda_vt_internal.h + +TESTPROGS = imgconvert \ + jpeg2000dwt \ + mathops \ + options \ + utils \ + avfft \ -TESTPROGS-$(CONFIG_FFT) += fft fft-fixed +TESTPROGS-$(CONFIG_CABAC) += cabac +TESTPROGS-$(CONFIG_FFT) += fft fft-fixed fft-fixed32 TESTPROGS-$(CONFIG_IDCTDSP) += dct TESTPROGS-$(CONFIG_IIRFILTER) += iirfilter +TESTPROGS-$(HAVE_MMX) += motion TESTPROGS-$(CONFIG_GOLOMB) += golomb TESTPROGS-$(CONFIG_RANGECODER) += rangecoder +TESTPROGS-$(CONFIG_SNOW_ENCODER) += snowenc TESTOBJS = dctref.o _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
