Merge commit '69f086e0f90f23d89e5739b099a4f984fa6a7885'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Dec 2012 16:39:03 +0000 (17:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Dec 2012 16:39:03 +0000 (17:39 +0100)
commitbe2c0adc968d3f8fc4a72dea7117529016f0a1ad
tree2af99ebfd95065b9cb028b1b9434379b059cc998
parentd27edc038a5d59f25b28964b38d9f8d7ce4a6e64
parent69f086e0f90f23d89e5739b099a4f984fa6a7885
Merge commit '69f086e0f90f23d89e5739b099a4f984fa6a7885'

* commit '69f086e0f90f23d89e5739b099a4f984fa6a7885':
  build: avfilter: Remove duplicate compilation entry for vf_scale

Conflicts:
libavfilter/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/Makefile