diff options
| author | Michael Niedermayer <[email protected]> | 2015-01-15 06:00:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-01-15 06:11:32 +0100 |
| commit | 3779973a9b8e473718cbd8490f277e589b27a9f6 (patch) | |
| tree | 38ebef0b56b2d912da32e6f8f64f1828bdf31df5 /libavcodec/get_bits.h | |
| parent | 27513846f66bfaf4dd38b819b71c4786075ee5d1 (diff) | |
| parent | f86f39cb9b1fcd063d5e4812132a75c06cc7acd2 (diff) | |
Merge commit 'f86f39cb9b1fcd063d5e4812132a75c06cc7acd2'
* commit 'f86f39cb9b1fcd063d5e4812132a75c06cc7acd2':
tiff: support decoding GBRP and GBRAP formats
Conflicts:
libavcodec/tiff.c
See: 379ad9788b80e05c0379adc49b26704dfd27d564
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/get_bits.h')
0 files changed, 0 insertions, 0 deletions