Merge commit '072916d903d3a925bcd0c864f12254157cab63c1'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Aug 2014 17:35:08 +0000 (19:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Aug 2014 17:35:08 +0000 (19:35 +0200)
commit85aaa4e6d571e44749f80b8223c07d656bf8e035
tree4ab335f77e8c50ebd7cd0f9924cef190e3356e2b
parentf1d6fc779450715fda20e7844ffc6364e50f5a3e
parent072916d903d3a925bcd0c864f12254157cab63c1
Merge commit '072916d903d3a925bcd0c864f12254157cab63c1'

* commit '072916d903d3a925bcd0c864f12254157cab63c1':
  filtfmts: Replace deprecated uses of AVFilterPad

Conflicts:
libavfilter/filtfmts.c

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