aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-21 17:39:03 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-21 17:39:03 +0100
commitbe2c0adc968d3f8fc4a72dea7117529016f0a1ad (patch)
tree2af99ebfd95065b9cb028b1b9434379b059cc998
parentd27edc038a5d59f25b28964b38d9f8d7ce4a6e64 (diff)
parent69f086e0f90f23d89e5739b099a4f984fa6a7885 (diff)
downloadffmpeg-be2c0adc968d3f8fc4a72dea7117529016f0a1ad.tar.gz
Merge commit '69f086e0f90f23d89e5739b099a4f984fa6a7885'
* commit '69f086e0f90f23d89e5739b099a4f984fa6a7885': build: avfilter: Remove duplicate compilation entry for vf_scale Conflicts: libavfilter/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavfilter/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 1145aebf78..1061444b1c 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -39,7 +39,6 @@ OBJS = allfilters.o \
sink_buffer.o \
src_buffer.o \
transform.o \
- vf_scale.o \
video.o \