diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 05:45:45 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 05:45:45 +0400 |
| commit | b9b2f9d218bad3001edc64704865987fd7cf7dca (patch) | |
| tree | 2fa210c6ef3eba82b0e1cf67ae315903f81098fb /ffmpeg.h | |
| parent | 75b4e4013796b26c8cc22fd9f9bec0cc8672c767 (diff) | |
| parent | a9b046fb0ae5395c4d1d8a82cd0d3e354b5034ed (diff) | |
Merge commit 'a9b046fb0ae5395c4d1d8a82cd0d3e354b5034ed'
* commit 'a9b046fb0ae5395c4d1d8a82cd0d3e354b5034ed':
tiff: use a better name and enum values for PhotometricInterpretation
Conflicts:
libavcodec/tiff.c
libavcodec/tiff.h
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions