Changeset ba5e7781 in ffmpeg

Timestamp:

Sep 12, 2013, 1:26:06 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b211607b

Parents:

52ed1d6d (diff), 00a63bfb (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> (09/12/13 13:12:52)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (09/12/13 13:26:06)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: matroskaenc: Fix stray pointers left over from av_reallocp_array refactoring

Conflicts:

libavformat/matroskaenc.c

Mostly not merged as the buggy code was no longer part of FFmpeg

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

(No files)