[FFmpeg-cvslog] Merge commit 'd423dd72be451462c6fb1cbbe313bed0194001ab'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 19 13:15:42 2014 +0100| [d1bd07d7662d38a4f1bce4b647635674446f7b84] | committer: Michael Niedermayer

Merge commit 'd423dd72be451462c6fb1cbbe313bed0194001ab'

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

Conflicts:
	libavcodec/smc.c

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

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