Merge commit 'e73996954d8e00117056dcefb38ef3d4d2f37967'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 20:52:46 +0000 (21:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 20:52:46 +0000 (21:52 +0100)
* commit 'e73996954d8e00117056dcefb38ef3d4d2f37967':
  filtfmts-test: Fix use of deprecated API

Conflicts:
libavfilter/filtfmts.c

See: f12174c8cef872030a156cbf252f4951c3a6357c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge