Changeset a804632b in ffmpeg

Timestamp:

Jun 8, 2013, 9:23:49 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1fec361f

Parents:

e2d4bcd7 (diff), 10393768 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (06/08/13 09:18:37)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/08/13 09:23:49)

Message:

Merge commit '103937681d7e6afd3e8caf8937272575e450fb55'

• commit '103937681d7e6afd3e8caf8937272575e450fb55': tiff: refactor deflate support in a separate function

Conflicts:

libavcodec/tiff.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)