[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 26 10:06:10 2013 +0200| [1906e00030b3f1cda2a5cf3abb3fcb08433eaa34] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  g2meet: Respect cursor_stride properly everywhere

See: c88ac1e0233f34582312dc617261b9270b61df19
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1906e00030b3f1cda2a5cf3abb3fcb08433eaa34
---