From: Carl Hetherington Date: Wed, 9 Jan 2013 23:59:20 +0000 (+0000) Subject: ffmpeg 0.10.4 seems not to need a buffersrc.h include. X-Git-Tag: v2.0.48~1348^2~15 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=bf596f1dca9c2b08e6208d78ebd6e4e284ca2d9e ffmpeg 0.10.4 seems not to need a buffersrc.h include. --- diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc index 17107a05b..376ab404f 100644 --- a/src/lib/filter_graph.cc +++ b/src/lib/filter_graph.cc @@ -23,7 +23,9 @@ extern "C" { #include +#ifdef HAVE_BUFFERSRC_H #include +#endif #if (LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR >= 53 && LIBAVFILTER_VERSION_MINOR <= 77) || LIBAVFILTER_VERSION_MAJOR == 3 #include #include diff --git a/wscript b/wscript index bc272b5d7..657ddc1fa 100644 --- a/wscript +++ b/wscript @@ -171,6 +171,16 @@ def configure(conf): define_name = 'HAVE_AV_FRAME_GET_BEST_EFFORT_TIMESTAMP', mandatory = False) + conf.check_cc(fragment = """ + extern "C" { + #include + } + int main() { } + """, msg = 'Checking for buffersrc.h', + uselib = 'AVCODEC', + define_name = 'HAVE_BUFFERSRC_H', + mandatory = False) + conf.recurse('src') conf.recurse('test')