[FFmpeg-cvslog] Merge commit '20c86571ccc71412781d4a4813e4693e0c42aec6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May  5 12:48:25 2013 +0200| [e7f8493fd8c9f1d0f7618dc068b5cb38e0395574] | committer: Michael Niedermayer

Merge commit '20c86571ccc71412781d4a4813e4693e0c42aec6'

* commit '20c86571ccc71412781d4a4813e4693e0c42aec6':
  lavfi: let gcc realign the stack on public graph driving functions

Conflicts:
	libavfilter/buffersink.c
	libavfilter/buffersrc.c

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

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