[FFmpeg-cvslog] Merge commit 'a331e11906b196c9a00f5ffbc45d80fcd7fe8423' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 11 22:31:54 2015 +0100| [ed69f0f72edb0d84e8bf27e0c000eb36dce5184c] | committer: Michael Niedermayer

Merge commit 'a331e11906b196c9a00f5ffbc45d80fcd7fe8423' into release/0.10

* commit 'a331e11906b196c9a00f5ffbc45d80fcd7fe8423':
  smc: fix the bounds check

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

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