You've already forked FFmpeg
							
							
				mirror of
				https://github.com/FFmpeg/FFmpeg.git
				synced 2025-10-30 23:18:11 +02:00 
			
		
		
		
	Merge commit '69f086e0f90f23d89e5739b099a4f984fa6a7885'
* commit '69f086e0f90f23d89e5739b099a4f984fa6a7885': build: avfilter: Remove duplicate compilation entry for vf_scale Conflicts: libavfilter/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
		| @@ -39,7 +39,6 @@ OBJS = allfilters.o                                                     \ | ||||
|        sink_buffer.o                                                    \ | ||||
|        src_buffer.o                                                     \ | ||||
|        transform.o                                                      \ | ||||
|        vf_scale.o                                                       \ | ||||
|        video.o                                                          \ | ||||
|  | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user