On Fri, 11 May 2018 11:38:52 +0100 Mark Thompson <s...@jkqxz.net> wrote:
> On 11/05/18 08:52, Haihao Xiang wrote: > > Currently an extra copy of mfx include headers from > > {MSDK_INSTALL_PREFIX}/include > > to {MSDK_INSTALL_PREFIX}/include/mfx is required when using pkg-config for > > libmfx detection. This fix checks the installed mfx include headers first, > > and falls back to the legacy way if that fails > > > > Signed-off-by: Haihao Xiang <haihao.xi...@intel.com> > > --- > > configure | 3 ++- > > fftools/ffmpeg_qsv.c | 5 +++++ > > libavcodec/qsv.c | 10 ++++++++++ > > libavcodec/qsv.h | 4 ++++ > > libavcodec/qsv_internal.h | 4 ++++ > > libavcodec/qsvdec.c | 4 ++++ > > libavcodec/qsvdec.h | 4 ++++ > > libavcodec/qsvdec_h2645.c | 4 ++++ > > libavcodec/qsvdec_other.c | 4 ++++ > > libavcodec/qsvenc.c | 5 +++++ > > libavcodec/qsvenc.h | 4 ++++ > > libavcodec/qsvenc_h264.c | 4 ++++ > > libavcodec/qsvenc_hevc.c | 4 ++++ > > libavcodec/qsvenc_jpeg.c | 4 ++++ > > libavcodec/qsvenc_mpeg2.c | 4 ++++ > > libavfilter/qsvvpp.h | 4 ++++ > > libavfilter/vf_deinterlace_qsv.c | 4 ++++ > > libavfilter/vf_scale_qsv.c | 4 ++++ > > libavutil/hwcontext_opencl.c | 4 ++++ > > libavutil/hwcontext_qsv.c | 4 ++++ > > libavutil/hwcontext_qsv.h | 4 ++++ > > 21 files changed, 90 insertions(+), 1 deletion(-) > > I don't think it's a good idea to put an #ifdef like this in every file. +1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel