Merge commit '306ee95088243fefa2dfcb5c355d439db75e2d2a' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Dec 2014 03:35:15 +0000 (04:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Dec 2014 03:35:19 +0000 (04:35 +0100)
* commit '306ee95088243fefa2dfcb5c355d439db75e2d2a':
  smc: fix the bounds check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/smc.c

Simple merge