Changeset 72eddc10 in ffmpeg

Timestamp:

Sep 27, 2013, 10:13:41 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e82071e7

Parents:

328a5b93 (diff), d872fb0f (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 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'

• commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9': lavf: Reset the entry count and allocation size variables on av_reallocp failures

Conflicts:

libavformat/avienc.c

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

(No files)