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
..
2011-09-22 00:22:52 +02:00
2011-08-09 19:56:21 +02:00
2011-09-19 12:38:34 +02:00
2011-09-27 22:00:20 +02:00
2011-08-09 19:56:25 +02:00
2011-04-10 04:31:54 +02:00
2011-09-16 21:22:05 +02:00
2011-08-09 19:56:21 +02:00
2011-01-30 03:41:47 +01:00