[FFmpeg-cvslog] Merge commit '3a177a9cca924e097265b32f9282814f6b653e08'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May  3 23:36:01 2014 +0200| [1c4110be90380fbe7c6bac1306616b79325107ed] | committer: Michael Niedermayer

Merge commit '3a177a9cca924e097265b32f9282814f6b653e08'

* commit '3a177a9cca924e097265b32f9282814f6b653e08':
  swscale: Fix an undefined behaviour

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

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