[FFmpeg-cvslog] Merge commit '556aab8f11b045a21182eee32413aa78d5c8539b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 16 15:50:43 2013 +0100| [18369967a56dc807804c3f2ff0fc97457356be34] | committer: Michael Niedermayer

Merge commit '556aab8f11b045a21182eee32413aa78d5c8539b'

* commit '556aab8f11b045a21182eee32413aa78d5c8539b':
  lavfi: use designated initializers in avfilter_class

Conflicts:
	libavfilter/avfilter.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=18369967a56dc807804c3f2ff0fc97457356be34
---