Changeset 3adb5f8d in ffmpeg

Timestamp:

Feb 5, 2014, 2:19:22 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6e380cc2

Parents:

6a4cc509 (diff), d9ae103 (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> (02/05/14 02:17:16)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/05/14 02:19:22)

Message:

Merge commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931'

• commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931': lavf: improve handling of sparse streams when muxing

Conflicts:

doc/APIchanges
libavformat/avformat.h
libavformat/mux.c
libavformat/options_table.h
libavformat/version.h

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

(No files)