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

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun May 11 16:44:08 2014 +0200| [3a67865963de4b0fcbfd201f8894f6c48d5ca9c1] | committer: Michael Niedermayer

Merge commit 'a56a9e65c6a17dd8b6303dd45bdc3e3368093092' into release/2.2

* commit 'a56a9e65c6a17dd8b6303dd45bdc3e3368093092':
  swscale: Fix an undefined behaviour

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

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