diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 13:01:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 13:11:19 +0100 |
| commit | 0db6402d9116b826fdf7f35409d229358ad81fd3 (patch) | |
| tree | c6289f90d70721e6e4fa5da9ffeb213502d71fad /libavcodec/adpcm.h | |
| parent | 4ced5d7780fea2ea49444d6686d26f26b3a2160f (diff) | |
| parent | 98c0cd0b99254cd12f312bf6a4c24cd3ec5886b5 (diff) | |
| download | ffmpeg-0db6402d9116b826fdf7f35409d229358ad81fd3.tar.gz | |
Merge commit '98c0cd0b99254cd12f312bf6a4c24cd3ec5886b5'
* commit '98c0cd0b99254cd12f312bf6a4c24cd3ec5886b5':
hevc: add new conformance streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcm.h')
0 files changed, 0 insertions, 0 deletions