Changeset 94ec2713 in ffmpeg

Timestamp:
Mar 7, 2014, 11:58:43 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
9baef60a
Parents:
d540e757 (diff), 48cfb5f4 (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> (03/07/14 11:58:39)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/07/14 11:58:43)
Message:

Merge commit '48cfb5f4114048383a4ee85b2f500eefce24cad2'

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

(No files)

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