Merge commit '8136f234445862c94d1c081606b2d1e3d44fccf3'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 15:09:25 +0000 (16:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 15:25:16 +0000 (16:25 +0100)
commit73562f1f834ef0ec8f5f881be73a135b9348c112
treef1889c88bff43a5bc9d0a3129aa62746a7628cd1
parent3138b158dd4bff334263b997664e9c1aeb02127b
parent8136f234445862c94d1c081606b2d1e3d44fccf3
Merge commit '8136f234445862c94d1c081606b2d1e3d44fccf3'

* commit '8136f234445862c94d1c081606b2d1e3d44fccf3':
  yop: check for input overreads.

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