diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 23:47:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 23:53:55 +0200 |
| commit | 4be1b6bef09737cef8173b619132fa13bef80818 (patch) | |
| tree | 649170b922ae4641f2519d9645db950d1a9256d2 /libavdevice | |
| parent | f01e3c5d000d264b2935e186594a37a3c00f9465 (diff) | |
| parent | 3ee217853a6741b829a2683f49c590618891b1ab (diff) | |
| download | ffmpeg-4be1b6bef09737cef8173b619132fa13bef80818.tar.gz | |
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>
Diffstat (limited to 'libavdevice')
0 files changed, 0 insertions, 0 deletions