diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 22:33:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 22:47:32 +0200 |
| commit | 55219a78c7d04d1937384366ba911c5d75c5c1e4 (patch) | |
| tree | 85efaa581ea0a51328bb8dda18727b84021b4c80 /COPYING.LGPLv3 | |
| parent | 4df3cf90bf7a54793e90304bd1b6c7599673f36a (diff) | |
| parent | 7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7 (diff) | |
| download | ffmpeg-55219a78c7d04d1937384366ba911c5d75c5c1e4.tar.gz | |
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>
Diffstat (limited to 'COPYING.LGPLv3')
0 files changed, 0 insertions, 0 deletions