Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 20:19:46 +0000 (21:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 20:24:54 +0000 (21:24 +0100)
commit50a3c823023bbbcdb64375cb64cfbb67c98698a9
tree6262227e0892e31eff96defc220a7b1c5a2264aa
parenta1b92569db6597bb4a662865564e7905a945264f
parent908836e20743d7e9462011a9f30a300a5bf247ca
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: Add section about AviSynth support

Conflicts:
doc/general.texi

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