ffmpeg/libavfilter
Michael Niedermayer 828044aca2 Merge commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff'
* commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff':
  af_resample: switch to an AVOptions-based system.

Conflicts:
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 13:30:17 +02:00
..
2013-04-03 08:33:59 +00:00
2013-04-10 00:08:57 +00:00
2012-03-17 11:21:49 +01:00
2013-03-17 12:31:25 +01:00
2013-03-10 13:56:17 +01:00
2013-01-05 05:21:44 +01:00
2013-04-10 00:08:57 +00:00
2012-11-29 02:09:40 +01:00
2013-03-10 02:13:02 +01:00
2013-04-08 12:10:37 +00:00
2012-11-29 02:09:01 +01:00
2013-03-15 03:02:27 +01:00