Merge remote-tracking branch 'qatar/master'

* qatar/master:
  miscellaneous typo fixes

Conflicts:
	configure
	libavformat/avisynth.c

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

diff --cc Changelog
Simple merge

diff --cc configure
index 398a62b,adda2cf..ef90e81
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -186,17 -173,10 +186,17 @@@ Individual component options
    --disable-filters        disable all filters
  
  External library support:
-   --enable-avisynth        enable reading of AVISynth script files [no]
+   --enable-avisynth        enable reading of AviSynth script files [no]
 -  --enable-bzlib           enable bzlib [autodetect]
 +  --disable-bzlib          disable bzlib [autodetect]
 +  --enable-fontconfig      enable fontconfig
    --enable-frei0r          enable frei0r video filtering
    --enable-gnutls          enable gnutls [no]
 +  --disable-iconv          disable iconv [autodetect]
 +  --enable-libaacplus      enable AAC+ encoding via libaacplus [no]
 +  --enable-libass          enable libass subtitles rendering [no]
 +  --enable-libbluray       enable BluRay reading using libbluray [no]
 +  --enable-libcaca         enable textual display using libcaca
 +  --enable-libcelt         enable CELT decoding via libcelt [no]
    --enable-libcdio         enable audio CD grabbing with libcdio
    --enable-libdc1394       enable IIDC-1394 grabbing using libdc1394
                             and libraw1394 [no]

diff --cc doc/faq.texi
index 4b0b09c,b400124..a0ae537
--- 1/doc/faq.texi
--- 2/doc/faq.texi
+++ b/doc/faq.texi
@@@ -229,13 -197,13 +229,13 @@@ Just create an "input.avs" text file wi
  @example
    DirectShowSource("C:\path to your file\yourfile.asf")
  @end example
 -... and then feed that text file to avconv:
 +... and then feed that text file to ffmpeg:
  @example
 -  avconv -i input.avs
 +  ffmpeg -i input.avs
  @end example
  
- For ANY other help on Avisynth, please visit the
- @uref{http://www.avisynth.org/, Avisynth homepage}.
+ For ANY other help on AviSynth, please visit the
+ @uref{http://www.avisynth.org/, AviSynth homepage}.
  
  @section How can I join video files?
  

diff --cc ffplay.c
Simple merge

diff --cc libavcodec/aac.h
Simple merge

diff --cc libavcodec/twinvq.c
Simple merge

diff --cc libavcodec/wma.c
Simple merge

diff --cc libavcodec/wmaprodec.c
Simple merge

diff --cc libavcodec/wmavoice.c
Simple merge

diff --cc tests/audiogen.c
Simple merge