Michael Niedermayer 6638207bce 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>

2011-10-06 03:42:14 +02:00

55 KiB

Raw Blame History

View Raw