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

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:
Michael Niedermayer 2012-12-21 17:39:03 +01:00
parent d27edc038a 69f086e0f9
commit be2c0adc96
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavfilter/Makefile
View File

@ -39,7 +39,6 @@ OBJS = allfilters.o \
sink_buffer.o \
src_buffer.o \
transform.o \
vf_scale.o \
video.o \