Merge commit 'd423dd72be451462c6fb1cbbe313bed0194001ab'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 12:30:25 +0000 (13:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 12:30:55 +0000 (13:30 +0100)
commitc266d0e1bd56272939feb4eeee91b927a27c0953
treee00e3371f9ca1b14848154bde4b3f1c8ca8b4b07
parent8af8833591d3efb26dcb0bb6f660cd0f3f107679
parentd423dd72be451462c6fb1cbbe313bed0194001ab
Merge commit 'd423dd72be451462c6fb1cbbe313bed0194001ab'

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

Conflicts:
libavcodec/smc.c

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