Merge commit '061c489895d29049a88dc6118e4b639a273b31d6'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 20:29:35 +0000 (21:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 20:29:35 +0000 (21:29 +0100)
commitcce8f750d91c013da00f5191ad537450172acc0c
treee8ba8fb8901094137b9f3f815c2789a1d07ae59f
parent92ec34707ff565980977cf5d7ea4d23bd16b3e28
parent061c489895d29049a88dc6118e4b639a273b31d6
Merge commit '061c489895d29049a88dc6118e4b639a273b31d6'

* commit '061c489895d29049a88dc6118e4b639a273b31d6':
  eamad: check for out of bounds read

Conflicts:
libavcodec/eamad.c

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