Skip to content

F
ffmpeg
Commit eedbc2b5 authored by Alex Smith's avatar Alex Smith Committed by Michael Niedermayer
Browse files
Options

tools: Fix apparent merge failure

parent 56f17407
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
tools/seek_print.c
View file @ eedbc2b5
...@@ -18,8 +18,6 @@ ...@@ -18,8 +18,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <unistd.h>
#include "config.h" #include "config.h"
#if HAVE_UNISTD_H #if HAVE_UNISTD_H
#include <unistd.h> /* getopt */ #include <unistd.h> /* getopt */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment