Merge commit '3ee217853a6741b829a2683f49c590618891b1ab'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 21:47:01 +0000 (23:47 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 21:53:55 +0000 (23:53 +0200)
commit4be1b6bef09737cef8173b619132fa13bef80818
tree649170b922ae4641f2519d9645db950d1a9256d2
parentf01e3c5d000d264b2935e186594a37a3c00f9465
parent3ee217853a6741b829a2683f49c590618891b1ab
Merge commit '3ee217853a6741b829a2683f49c590618891b1ab'

* commit '3ee217853a6741b829a2683f49c590618891b1ab':
  Support the Hap chunked frame format

Conflicts:
libavcodec/hap.h
libavcodec/hapdec.c
libavcodec/version.h

See: c7e6443441ed5c1b5f64067dfbf4956bc2c6acbb
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/hap.h
libavcodec/hapdec.c
libavcodec/version.h