summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-29 16:06:58 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-29 16:06:58 +0100
commitb1da49fd4f3bc918de2ee4cdf49959258576977c (patch)
tree464f95444b78c651ab4cd195f17af988d60deaab
parent003de48cd0371a60d095dc9d02ed5763c410cf5e (diff)
Remove unnecessary include; add makedcp-osx.
-rwxr-xr-xrun/makedcp-osx15
-rw-r--r--src/lib/ffmpeg_decoder.cc1
2 files changed, 15 insertions, 1 deletions
diff --git a/run/makedcp-osx b/run/makedcp-osx
new file mode 100755
index 000000000..1b95ecc5d
--- /dev/null
+++ b/run/makedcp-osx
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:build/src/lib:build/src:/Users/carl/Environments/osx/10.8/lib
+if [ "$1" == "--debug" ]; then
+ shift
+ gdb --args build/src/tools/makedcp "$@"
+elif [ "$1" == "--memcheck" ]; then
+ shift
+ valgrind --tool="memcheck" --leak-check=full --show-reachable=yes build/src/tools/makedcp "$@"
+elif [ "$1" == "--massif" ]; then
+ shift
+ valgrind --tool="massif" build/src/tools/makedcp "$@"
+else
+ build/src/tools/makedcp "$@"
+fi
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 982139515..bcfbea431 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -29,7 +29,6 @@
#include <stdint.h>
#include <boost/lexical_cast.hpp>
extern "C" {
-#include <tiffio.h>
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
#include <libswscale/swscale.h>