Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 09:26:39 +0000 (11:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 09:26:39 +0000 (11:26 +0200)
commitc7d17179571daa875083e2fe72c498ae47772d75
tree63c60576f671d518e272fdca55d5371db82f7d35
parent5fae4678949b2a24225c152867ebd97c4918dc53
parent0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8
Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8'

* commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8':
  avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typo

Conflicts:
doc/general.texi
libavformat/avisynth.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/general.texi
libavfilter/vf_gradfun.c