Changeset 2efc2b53 in ffmpeg

Timestamp:

Jul 11, 2013, 9:32:36 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5698f6bd

Parents:

56090b5 (diff), 7d65e960 (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> (07/11/13 09:29:51)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/11/13 09:32:36)

Message:

Merge commit '7d65e960c72f36b73ae7fe84f8e427d758e61da9'

• commit '7d65e960c72f36b73ae7fe84f8e427d758e61da9': iff: Do not read over the source buffer

Conflicts:

libavcodec/iff.c

See: 2fbb37b51bbea891392ad357baf8f3dff00bac05

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

(No files)