Changeset 9266eb0c in ffmpeg

Timestamp:

Nov 20, 2014, 10:41:30 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e39f8fad

Parents:

29d208d5 (diff), 25ccf5d (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> (11/20/14 10:41:27)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/20/14 10:41:30)

Message:

Merge remote-tracking branch 'cehoyos/master'

• cehoyos/master: lavf/mux: Always call write_trailer() from av_write_trailer() to avoid a leak.

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

(No files)