Changeset 9f028b3f in ffmpeg

Timestamp:

Jun 17, 2014, 11:29:19 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3f2f87cd

Parents:

eb0fc73d (diff), 49106844 (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 '49106844929b7b71ac719064d640f8aa56c89b1f'

• commit '49106844929b7b71ac719064d640f8aa56c89b1f': tiffenc: fix packet size calculation

Conflicts:

libavcodec/tiffenc.c

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

(No files)