[FFmpeg-cvslog] Merge commit 'ede738880032db62b7dc5b3712f769d3826f5974' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  8 15:16:43 2014 +0200| [0d6ed2f13faf3b31ee5688c0def762506f39542b] | committer: Michael Niedermayer

Merge commit 'ede738880032db62b7dc5b3712f769d3826f5974' into release/1.1

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

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

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