Merge commit '58dc526ebf722d33bf09275c1241674e0e6b9ef1' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Dec 2014 11:20:28 +0000 (12:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Dec 2014 11:20:46 +0000 (12:20 +0100)
commitb86c2640f65444981718d74dedb85a249d66435c
tree16ad29ed0c4b1884da897d060f5a87939b3c1832
parent9b9411c1cf97da1eeb8a1f09281ed7455590beb3
parent58dc526ebf722d33bf09275c1241674e0e6b9ef1
Merge commit '58dc526ebf722d33bf09275c1241674e0e6b9ef1' into release/2.4

* commit '58dc526ebf722d33bf09275c1241674e0e6b9ef1':
  smc: fix the bounds check

Conflicts:
libavcodec/smc.c

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