Changeset 1ebc77bc in ffmpeg

Timestamp:
Jun 18, 2014, 9:13:31 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
be94f5c1
Parents:
eba453e (diff), 49a24268 (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/18/14 21:09:35)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (06/18/14 21:13:31)
Message:

Merge commit '49a242687cf44f86570b706db3c5912ff06bc6c2'

Conflicts:

doc/muxers.texi

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

(No files)

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