RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tools: Fix apparent merge failure

This commit is contained in:
Alex Smith 2013-09-21 08:32:24 -04:00 committed by Michael Niedermayer
parent 56f17407bc
commit eedbc2b56d
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/seek_print.c
View File

@ -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 */