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-27 15:26:14 +02:00
2011-07-10 04:28:50 +02:00
2011-07-04 00:45:21 +02:00
2011-07-01 09:49:32 +02:00
2011-07-10 04:28:50 +02:00
2011-06-27 15:26:14 +02:00
2011-06-24 03:07:04 +02:00
2011-05-21 17:23:14 +02:00
2011-05-21 17:23:14 +02:00
2011-05-21 17:23:14 +02:00
2011-05-21 17:23:14 +02:00
2011-05-21 17:23:14 +02:00
2011-05-27 12:15:09 +02:00
2011-05-27 12:15:09 +02:00
2011-06-03 05:19:30 +02:00
2011-07-15 17:51:09 +02:00
2011-05-27 12:15:09 +02:00
2011-07-06 01:34:08 +02:00
2011-06-29 05:23:12 +02:00
2011-07-01 10:51:46 +02:00
2011-07-09 02:06:40 +02:00
2011-06-05 13:55:02 +02:00
2011-05-27 12:15:09 +02:00
2011-05-27 12:15:09 +02:00
2011-05-26 03:28:22 +02:00
2011-06-09 22:53:17 +02:00
2011-06-24 03:07:04 +02:00
2011-05-27 12:15:09 +02:00
2011-06-24 03:07:04 +02:00
2011-08-01 00:35:57 +02:00
335bbe424f