Michael Niedermayer 55219a78c7 Merge commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7'
* commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7':
  Hap decoder and encoder

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/allcodecs.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-22 22:47:32 +02:00
..
2015-01-12 01:18:01 +01:00
2015-06-10 13:08:48 -08:00
2015-04-23 23:56:21 -07:00
2015-02-02 05:04:14 +01:00
2015-04-11 01:00:07 +02:00