diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-21 01:02:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-21 01:04:30 +0100 |
| commit | 88839718b58c336e4da9cf2511d91c3ebae444b4 (patch) | |
| tree | 0af53f285a9868acbd183910b6ed5d8132a01d53 /libavutil/xtea.h | |
| parent | 9567162237d2ac24d0866196534166fc7fc976ef (diff) | |
| parent | 5c3fa74b94fdedfd63b606f36920d7fbbc069b72 (diff) | |
| download | ffmpeg-88839718b58c336e4da9cf2511d91c3ebae444b4.tar.gz | |
Merge commit '5c3fa74b94fdedfd63b606f36920d7fbbc069b72'
* commit '5c3fa74b94fdedfd63b606f36920d7fbbc069b72':
hevc: support luma bit depth != chroma bit depth for PCM coding units
Conflicts:
libavcodec/hevc.c
See: 0afa254d4efd3c06fd0194789aefc193c8506947
See: a7e300649a7a2105a4f7edfaf936f0a9e05a2d43
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/xtea.h')
0 files changed, 0 insertions, 0 deletions