1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00

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

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