Merge commit 'e818da77240146b36d6669b1c4e0565239dc55d3' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 00:18:06 +0000 (01:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 00:18:06 +0000 (01:18 +0100)
commit5bd9c540d6a6f55f6176438e1418a2d35707460e
tree8259f960fa650ac637594150f254d7b2098f89f1
parentbb2a5ea2cf10125ebabc9026ba63536a210c957f
parente818da77240146b36d6669b1c4e0565239dc55d3
Merge commit 'e818da77240146b36d6669b1c4e0565239dc55d3' into release/2.4

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

Conflicts:
libavcodec/eamad.c

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