[FFmpeg-cvslog] Merge commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 18 13:31:45 2013 +0200| [d56ced5fbf3c76ebd5c5b015695101c634e53e4a] | committer: Michael Niedermayer

Merge commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081'

* commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081':
  avfilter.c: cosmetics, reformat

Conflicts:
	libavfilter/avfilter.c

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

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