Merge commit '9652d4fcfc9c07a726b35efc4ac644d9751b36d7'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Mar 2013 12:34:14 +0000 (13:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Mar 2013 12:34:20 +0000 (13:34 +0100)
commit5be70f58260efc9f4718fe5dd842d20b9eca391c
tree368a8908fd2971d77ffa1d71f6e7dbdcdaad45f2
parent231795270b67496e01ad87731e0e95853146f038
parent9652d4fcfc9c07a726b35efc4ac644d9751b36d7
Merge commit '9652d4fcfc9c07a726b35efc4ac644d9751b36d7'

* commit '9652d4fcfc9c07a726b35efc4ac644d9751b36d7':
  ape: provide two additional bytes in buffer for old MAC versions

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