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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 20 05:43:23 2014 +0200| [cd4faed89378dfb9ba4c985ef661d10c0d7e7b7e] | committer: Michael Niedermayer

Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/xv: implement repaint message
  lavd/xv: add window id param
  lavd/xv: keep aspect ratio

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

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