Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Sep 2013 11:50:46 +0000 (13:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Sep 2013 11:52:59 +0000 (13:52 +0200)
* qatar/master:
  avisynth: K&R formatting cosmetics

Conflicts:
libavformat/avisynth.c

Nothing changed as the avisynth code has been rewritten to
support avi/avxsynth in ffmpeg.
And the new code should be free of formating problems.

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

Trivial merge