* commit '7ca3e520':
  Hap decoder and encoder

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/allcodecs.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>