diff options
author | Alex Smith <alex.smith@warpsharp.info> | 2013-09-21 08:32:24 -0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-21 14:40:31 +0200 |
commit | eedbc2b56d4cebc80206494c01b17c2807c68695 (patch) | |
tree | 05b76286191bfcaabb4ff908df076f6c94f6657f /tools | |
parent | 56f17407bc4673dad263982d6fad5ef3ae8c9240 (diff) | |
download | ffmpeg-eedbc2b56d4cebc80206494c01b17c2807c68695.tar.gz |
tools: Fix apparent merge failure
Diffstat (limited to 'tools')
-rw-r--r-- | tools/seek_print.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/seek_print.c b/tools/seek_print.c index 8eb7627b52..c42b28dd44 100644 --- a/tools/seek_print.c +++ b/tools/seek_print.c @@ -18,8 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <unistd.h> - #include "config.h" #if HAVE_UNISTD_H #include <unistd.h> /* getopt */ |