Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Jul 2013 08:48:15 +0000 (10:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Jul 2013 08:50:51 +0000 (10:50 +0200)
commitb67401797e4e51c0fdc0978d2219ac3703403a85
tree1286e7ce2646853a19aa800069aae1be054397a4
parent48353325372ae7c1721c55bafe33cf0816301a5e
parent6756d98cec7dbeab6d407abc656d06d7ba97fdda
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi: filtfmts: use newer avfilter APIs

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