Changeset 8469c735 in ffmpeg

Timestamp:
Jun 26, 2014, 10:57:04 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
ad081e4d
Parents:
9a2850c (diff), 182d3f82 (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> (06/26/14 22:50:32)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/26/14 22:57:04)
Message:

Merge commit '182d3f8221c23716ea4eafa460bdb94968f71f26'

Conflicts:

doc/examples/muxing.c

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.