Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Oct 2011 01:42:14 +0000 (03:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Oct 2011 01:42:14 +0000 (03:42 +0200)
commit6638207bce4eabd3f99295c1ab096d2815eff3ce
tree7ffc8358858c6628812a7514dc6e11d02083b2e2
parent2c1c0c5024f8e82200874762cbeeda494875b7e3
parente83c2ddebf8ee90086d8e34de9c8ba245f548f89
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Fix 'heigth' vs. 'height' typos.
  lavc/lavf: use unique private classes.
  lavc: use designated initializers for av_codec_context_class

Conflicts:
libavdevice/fbdev.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/filters.texi
libavcodec/ac3dec.c
libavcodec/dnxhddec.c
libavcodec/options.c
libavdevice/fbdev.c
libavformat/img2.c
libavformat/movenc.c