[FFmpeg-cvslog] Merge commit 'ac1660509ecfbeca7b63eb5ab8360011180e705b' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Tue May 19 21:08:45 2015 +0200| [3cc8285439ddb6d8b7eb108cdb7dc793a75e1dbd] | committer: Michael Niedermayer

Merge commit 'ac1660509ecfbeca7b63eb5ab8360011180e705b' into release/2.4

* commit 'ac1660509ecfbeca7b63eb5ab8360011180e705b':
  ape: Support _0000 files with nblock smaller than 64

Conflicts:
	libavcodec/apedec.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3cc8285439ddb6d8b7eb108cdb7dc793a75e1dbd
---