Merge commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jun 2015 20:33:46 +0000 (22:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jun 2015 20:47:32 +0000 (22:47 +0200)
commit55219a78c7d04d1937384366ba911c5d75c5c1e4
tree85efaa581ea0a51328bb8dda18727b84021b4c80
parent4df3cf90bf7a54793e90304bd1b6c7599673f36a
parent7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7
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>
16 files changed:
Changelog
configure
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/hap.h
libavcodec/hapdec.c
libavcodec/hapenc.c
libavcodec/version.h
libavformat/isom.c
tests/fate/video.mak
tests/ref/fate/hap1
tests/ref/fate/hap5
tests/ref/fate/hapy