diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-29 19:58:12 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-29 19:58:12 +0100 |
| commit | 37258f4ee74582feaac8b311baaeb27bf5f17ac9 (patch) | |
| tree | 800d62c9832326c3760eb8c6bcc899a7c08e54a2 /src/lib/ffmpeg_decoder.cc | |
| parent | d3e2e0dfd6f840f01a86590cca3ba3315c146710 (diff) | |
| parent | b1da49fd4f3bc918de2ee4cdf49959258576977c (diff) | |
Merge branch 'master' of /home/carl/git/dvdomatic
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 1 |
1 files changed, 0 insertions, 1 deletions
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> |