diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-09-30 14:56:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-09-30 14:56:35 +0100 |
| commit | d2ca18d5b2a3351745cc8be2840308808e5a2d36 (patch) | |
| tree | 73dfb23d9899eb7708fad1215cad93f0aea9ca02 | |
| parent | b81ca5ddf8b6e5a62c56b6b22b1fe1a16b862a6a (diff) | |
Remove references to libswresample.
| -rw-r--r-- | platform/osx/make_dmg.sh | 1 | ||||
| -rw-r--r-- | platform/windows/wscript | 1 | ||||
| -rw-r--r-- | src/lib/wscript | 2 | ||||
| -rw-r--r-- | wscript | 3 |
4 files changed, 2 insertions, 5 deletions
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 199d9c985..ca0b08101 100644 --- 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 3b9882b2f..7d5b8d8f1 100644 --- 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 3daf3ecf4..d44746ba9 100644 --- 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 @@ -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 |