* commit '69f086e0f9':
  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
commit be2c0adc96

View file

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