Remove references to libswresample.

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 199d9c985517d89b11b535c50a0e591ed5bcd97a..ca0b081013d8410912693ff053ffdd82021fcc56 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -73,7 +73,6 @@ universal_copy_lib $ROOT libavfilter "$WORK/$libs"
 universal_copy_lib $ROOT libavutil "$WORK/$libs"
 universal_copy_lib $ROOT libavcodec "$WORK/$libs"
 universal_copy_lib $ROOT libswscale "$WORK/$libs"
-universal_copy_lib $ROOT libswresample "$WORK/$libs"
 universal_copy_lib $ROOT libpostproc "$WORK/$libs"
 universal_copy $ROOT bin/ffprobe "$WORK/$macos"
 universal_copy_lib $ENV libboost_system "$WORK/$libs"

diff --git a/platform/windows/wscript b/platform/windows/wscript
index 3b9882b2fbb11471acef74c1714b6f8c8b95fe29..7d5b8d8f195b43c988448bcd227481ec0bf000b4 100644 (file)
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -134,7 +134,6 @@ File "%cdist_deps%/bin/avdevice-56.dll"
 File "%cdist_deps%/bin/postproc-53.dll"
 File "%cdist_deps%/bin/dcp-1.0.dll"
 File "%cdist_deps%/bin/libopenjpeg-1.dll"
-File "%cdist_deps%/bin/swresample-1.dll"
 File "%cdist_deps%/bin/swscale-3.dll"
 File "%cdist_deps%/bin/cxml-0.dll"
 File "%cdist_deps%/bin/sub-1.0.dll"

diff --git a/src/lib/wscript b/src/lib/wscript
index 3daf3ecf4b667d182b96a79002c51f849f7a0292..d44746ba9a24517238422cde13a1712e0806f4d3 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -140,7 +140,7 @@ def build(bld):
     obj.name = 'libdcpomatic2'
     obj.export_includes = ['..']
     obj.uselib = """
-                 AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE
+                 AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
                  SNDFILE SAMPLERATE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
                  CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU

diff --git a/wscript b/wscript
index a30da5e406817300d90262fb5e9199aa687fe24a..93a5d1e91d0d1ad4a579a5dcaf927b541081c81b 100644 (file)
--- a/wscript
+++ b/wscript
@@ -279,7 +279,7 @@ def configure(conf):
 
     # FFmpeg
     if conf.options.static_ffmpeg:
-        names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'swresample', 'postproc']
+        names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc']
         for name in names:
             static = subprocess.Popen(shlex.split('pkg-config --static --libs lib%s' % name), stdout=subprocess.PIPE).communicate()[0]
             libs = []
@@ -307,7 +307,6 @@ def configure(conf):
         conf.check_cfg(package='libavcodec', args='--cflags --libs', uselib_store='AVCODEC', mandatory=True)
         conf.check_cfg(package='libavutil', args='--cflags --libs', uselib_store='AVUTIL', mandatory=True)
         conf.check_cfg(package='libswscale', args='--cflags --libs', uselib_store='SWSCALE', mandatory=True)
-        conf.check_cfg(package='libswresample', args='--cflags --libs', uselib_store='SWRESAMPLE', mandatory=True)
         conf.check_cfg(package='libpostproc', args='--cflags --libs', uselib_store='POSTPROC', mandatory=True)
 
     # Boost