[FFmpeg-cvslog] Merge remote-tracking branch 'cus/stable'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec 25 16:36:49 2012 +0100| [0b980e57ace0acf74bee8bcfc89cbd4f0ff2a602] | committer: Michael Niedermayer

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: fix greenish line on the right edge with some xv sizes

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

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