[FFmpeg-cvslog] Merge commit 'a9b046fb0ae5395c4d1d8a82cd0d3e354b5034ed'

Michael Niedermayer git at videolan.org
Sun Apr 13 03:51:36 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 13 03:45:45 2014 +0200| [b9b2f9d218bad3001edc64704865987fd7cf7dca] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b9b2f9d218bad3001edc64704865987fd7cf7dca
---





More information about the ffmpeg-cvslog mailing list