FFmpeg/libavcodec
Michael Niedermayer 4be1b6bef0 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>
2015-07-27 23:53:55 +02:00
..
2015-07-27 19:13:48 +02:00
2015-07-27 19:13:48 +02:00
2015-07-27 19:13:48 +02:00
2015-07-25 14:07:55 +02:00
2015-06-14 15:09:33 +02:00
2015-07-22 23:23:29 +02:00
2015-07-22 16:15:53 +02:00
2015-07-27 16:00:22 +01:00
2015-07-27 16:00:22 +01:00
2015-06-17 20:11:43 +02:00
2015-07-27 19:13:48 +02:00
2015-07-22 23:23:29 +02:00
2015-07-10 16:21:50 +02:00
2015-07-27 15:24:58 +01:00