* commit 'ae5a8dca':
  hap: Fix slice size computation

Conflicts:
	libavcodec/hapdec.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>