Merge commit 'a9b046fb0ae5395c4d1d8a82cd0d3e354b5034ed'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 01:45:45 +0000 (03:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 01:45:45 +0000 (03:45 +0200)
commitb9b2f9d218bad3001edc64704865987fd7cf7dca
tree2fa210c6ef3eba82b0e1cf67ae315903f81098fb
parent75b4e4013796b26c8cc22fd9f9bec0cc8672c767
parenta9b046fb0ae5395c4d1d8a82cd0d3e354b5034ed
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>
libavcodec/tiff.c
libavcodec/tiff.h
libavcodec/tiffenc.c