Michael Niedermayer 335bbe424f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavc: Deprecate unused FF_ER_VERY_AGGRESSIVE
  x11grab: add show_region AVOption.
  x11grab: add follow_mouse AVOption.
  Do not convert RGB buffer at once when stride does not fit exact samples.

Conflicts:
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-01 00:35:57 +02:00
..
2011-06-02 14:43:29 +02:00
2011-06-07 00:37:00 +02:00
2011-06-05 13:31:47 +02:00
2011-04-10 04:31:54 +02:00
2011-01-30 03:41:47 +01:00