diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-22 21:11:18 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-22 21:11:18 +0100 |
| commit | f0edd6ab35c3c2b7800a26ec8206adab75e5f633 (patch) | |
| tree | aad6fc8ca2d932bcc630254e339fd648d8a10f50 /platform | |
| parent | 6d26c4afe1e2b63d346d311ceffe41bf8cb62572 (diff) | |
| parent | 14b1f672dc92ae8e1385c75e30420a4dcb4e32c9 (diff) | |
Merge master.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/osx/make_dmg.sh | 1 | ||||
| -rw-r--r-- | platform/windows/wscript | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 93af4f334..92c6dc96b 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -56,6 +56,7 @@ universal_copy $ROOT lib/libavutil*.dylib $WORK/$libs universal_copy $ROOT lib/libavcodec*.dylib $WORK/$libs universal_copy $ROOT lib/libswscale*.dylib $WORK/$libs universal_copy $ROOT lib/libswresample*.dylib $WORK/$libs +universal_copy $ROOT lib/libpostproc*.dylib $WORK/$libs universal_copy $ROOT bin/ffprobe $WORK/$macos universal_copy $ENV lib/libboost_system.dylib $WORK/$libs universal_copy $ENV lib/libboost_filesystem.dylib $WORK/$libs diff --git a/platform/windows/wscript b/platform/windows/wscript index 7fc317e47..5b9bd63f2 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -110,6 +110,7 @@ File "%cdist_deps%/bin/avfilter-4.dll" File "%cdist_deps%/bin/avformat-55.dll" File "%cdist_deps%/bin/avutil-52.dll" File "%cdist_deps%/bin/avdevice-55.dll" +File "%cdist_deps%/bin/postproc-52.dll" File "%cdist_deps%/bin/dcp.dll" File "%cdist_deps%/bin/libopenjpeg-1.dll" File "%cdist_deps%/bin/swresample-0.dll" |