[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Mon Aug 1 00:46:53 CEST 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 1 00:35:57 2011 +0200| [335bbe424f6d21b5540230db8dadd4f42751d260] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=335bbe424f6d21b5540230db8dadd4f42751d260
---
More information about the ffmpeg-cvslog
mailing list