[FFmpeg-cvslog] Merge commit '9726f3007196a9c3589c4f09a81c0d75e1d97f2c' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 12:50:04 2015 +0200| [f84672c09a00d5e7ecba5fd6220543dad5849c7a] | committer: Michael Niedermayer

Merge commit '9726f3007196a9c3589c4f09a81c0d75e1d97f2c' into release/2.2

* commit '9726f3007196a9c3589c4f09a81c0d75e1d97f2c':
  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=f84672c09a00d5e7ecba5fd6220543dad5849c7a
---