You've already forked FFmpeg
							
							
				mirror of
				https://github.com/FFmpeg/FFmpeg.git
				synced 2025-10-30 23:18:11 +02:00 
			
		
		
		
	tools: Fix apparent merge failure
This commit is contained in:
		
				
					committed by
					
						 Michael Niedermayer
						Michael Niedermayer
					
				
			
			
				
	
			
			
			
						parent
						
							56f17407bc
						
					
				
				
					commit
					eedbc2b56d
				
			| @@ -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 */ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user