Merge master and multifarious hackery.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index f2b21bde35462934858cfbfac42610ecec387c11..b82af4c37438afa59591b3a8fd0154a370174f16 100644 (file)
--- a/wscript
+++ b/wscript
@@ -174,36 +174,6 @@ def configure(conf):
                              define_name = 'HAVE_G_FORMAT_SIZE',
                              mandatory = False)
 
-    conf.check_cc(fragment = """
-                             extern "C" {
-                               #include <libavutil/avutil.h>
-                             }
-                             int main() { AVPixelFormat f; }
-                             """, msg = 'Checking for AVPixelFormat',
-                             uselib = 'AVUTIL',
-                             define_name = 'HAVE_AV_PIXEL_FORMAT',
-                             mandatory = False)
-
-    conf.check_cc(fragment = """
-                             extern "C" {
-                               #include <libavcodec/avcodec.h>
-                             }
-                             int main() { AVFrame* f; av_frame_get_best_effort_timestamp(f); }
-                             """, msg = 'Checking for av_frame_get_best_effort_timestamp',
-                             uselib = 'AVCODEC',
-                             define_name = 'HAVE_AV_FRAME_GET_BEST_EFFORT_TIMESTAMP',
-                             mandatory = False)
-
-    conf.check_cc(fragment = """
-                             extern "C" {
-                               #include <libavfilter/buffersrc.h>
-                             }
-                             int main() { } 
-                             """, msg = 'Checking for buffersrc.h',
-                             uselib = 'AVCODEC',
-                             define_name = 'HAVE_BUFFERSRC_H',
-                             mandatory = False)
-
     conf.find_program('msgfmt', var='MSGFMT')
     
     datadir = conf.env.DATADIR