[FFmpeg-cvslog] tools: Fix apparent merge failure

[Alex Smith]

ffmpeg | branch: master | Alex Smith <alex.smith at warpsharp.info> | Sat Sep 21 08:32:24 2013 -0400| [eedbc2b56d4cebc80206494c01b17c2807c68695] | committer: Michael Niedermayer

tools: Fix apparent merge failure

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eedbc2b56d4cebc80206494c01b17c2807c68695
---

 tools/seek_print.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/tools/seek_print.c b/tools/seek_print.c
index 8eb7627..c42b28d 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 */