Merge commit '1dd35611433c224e2231ed7ae26b5b560863a3cb'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 10:46:54 +0000 (12:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 10:47:22 +0000 (12:47 +0200)
commitdd2eaf57b76033bf5e8d49457088dec60ad3e9a4
tree7ab47b47d9c65e4dcf997f17c68027748e89a07d
parent71b7427e9bdda62d5f4cb042c608ad99b1bf28b9
parent1dd35611433c224e2231ed7ae26b5b560863a3cb
Merge commit '1dd35611433c224e2231ed7ae26b5b560863a3cb'

* commit '1dd35611433c224e2231ed7ae26b5b560863a3cb':
  vf_format: do not use the AVFilterFormats internals.

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