Changeset da203822 in ffmpeg

Timestamp:

Aug 27, 2013, 10:47:04 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

23120138

Parents:

ef4fcb30 (diff), 2bbad1f (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 '2bbad1f94cbc5eab0aa2d937bc79d085477d0242'

• commit '2bbad1f94cbc5eab0aa2d937bc79d085477d0242': movenc: Properly free allocated data on failures in mov_write_header

Conflicts:

libavformat/movenc.c

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

(No files)