Merge commit 'c17da32ba26d2c333bd9cd4afe38a1b36e3d6cba' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 12:45:40 +0000 (13:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 12:45:40 +0000 (13:45 +0100)
commit396b47d2a71797e77ad22567b5f2f1ac9874ee51
tree6efb0f071633b7ea003b2f6fce546014143d0111
parentdec5586bc7340e4aeca86f22c64846767814a8f2
parentc17da32ba26d2c333bd9cd4afe38a1b36e3d6cba
Merge commit 'c17da32ba26d2c333bd9cd4afe38a1b36e3d6cba' into release/1.1

* commit 'c17da32ba26d2c333bd9cd4afe38a1b36e3d6cba':
  eamad: check for out of bounds read

Conflicts:
libavcodec/eamad.c

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