Merge commit '9cef65434e5e5ffbd4a856ce7ae9c067dec039b7' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Mar 2015 01:26:42 +0000 (03:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Mar 2015 01:27:07 +0000 (03:27 +0200)
commit8e7eb268758dcb37a4452d02e8908ebf709e21e2
tree7af4d0bcbf0ce2d7a3b32913260faed6957c6243
parent6e835eb2dd5204f04822558474c16f41583e0ed5
parent9cef65434e5e5ffbd4a856ce7ae9c067dec039b7
Merge commit '9cef65434e5e5ffbd4a856ce7ae9c067dec039b7' into release/2.4

* commit '9cef65434e5e5ffbd4a856ce7ae9c067dec039b7':
  h264_ps: properly check cropping parameters against overflow

Conflicts:
libavcodec/h264_ps.c

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