eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-05-31 12:46:39 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
a94de50ba02f5c260ca7c571b43fb595c8f951b6
ffmpeg/libavcodec/tiffenc.c
T
Michael Niedermayer b9b2f9d218 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>
2014-04-13 03:45:45 +02:00

19 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink