Changeset 1d0995e3 in ffmpeg

Timestamp:

Dec 13, 2013, 2:44:45 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0f02ea0a

Parents:

47eb15b9 (diff), fb5518cf (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> (12/13/13 14:44:39)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/13/13 14:44:45)

Message:

Merge remote-tracking branch 'cehoyos/master'

• cehoyos/master: Force one stream in caf muxer.

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

(No files)