[FFmpeg-cvslog] Merge commit 'bea14966e2a37019cb4e38420868c5bb0542d487' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 11 18:01:29 2014 +0200| [97cbad3d2c906ed5bd1c30f289f523ee2c15ab73] | committer: Michael Niedermayer

Merge commit 'bea14966e2a37019cb4e38420868c5bb0542d487' into release/2.2

* commit 'bea14966e2a37019cb4e38420868c5bb0542d487':
  mmvideo: check horizontal coordinate too

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

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