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

54 KiB

Raw Blame History

View Raw