[FFmpeg-cvslog] Merge remote-tracking branch 'cigaes/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May  7 23:28:12 2013 +0200| [bc0cbaca62b6d74e88a637eedc0cbed80721a0c7] | committer: Michael Niedermayer

Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavfi: add comments to explain the negotiation loop.
  lavfi: fix filter format negotiation loop.
  ffmpeg: move a local variable definition later.

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

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