Changeset b9b2f9d2 in ffmpeg

Timestamp:

Apr 13, 2014, 1:45:45 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a64d6d51

Parents:

75b4e401 (diff), a9b046fb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)