From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 4 Nov 2013 20:52:46 +0000 (+0100)
Subject: Merge commit 'e73996954d8e00117056dcefb38ef3d4d2f37967'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4b4a7fcb073ecfacfa93a49144acc05c3ece9819;p=ffmpeg

Merge commit 'e73996954d8e00117056dcefb38ef3d4d2f37967'

* commit 'e73996954d8e00117056dcefb38ef3d4d2f37967':
  filtfmts-test: Fix use of deprecated API

Conflicts:
	libavfilter/filtfmts.c

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

4b4a7fcb073ecfacfa93a49144acc05c3ece9819