Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 Jul 2011 22:35:57 +0000 (00:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 Jul 2011 22:35:57 +0000 (00:35 +0200)
commit335bbe424f6d21b5540230db8dadd4f42751d260
treedb80afbc0ca61d9705fd8a30a49f9599c4b09a28
parentb39f872a41b92a31589052c8f914c5b52f206fd0
parent18cb40f074ec7e79b20bf9b8c8f19c55784a071c
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>
doc/ffmpeg.texi
doc/indevs.texi
libavcodec/avcodec.h
libavcodec/options.c
libavcodec/version.h
libavdevice/x11grab.c
libswscale/swscale_unscaled.c