Merge commit 'ac1660509ecfbeca7b63eb5ab8360011180e705b' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 19:08:45 +0000 (21:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 19:08:45 +0000 (21:08 +0200)
* commit 'ac1660509ecfbeca7b63eb5ab8360011180e705b':
  ape: Support _0000 files with nblock smaller than 64

Conflicts:
libavcodec/apedec.c

See: 699341d647f7af785fb8ceed67604467b0b9ab12
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge