Changeset 3d7218d9 in ffmpeg

Timestamp:
May 13, 2014, 8:40:32 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
efa95968
Parents:
d90ba41 (diff), 44951174 (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> (05/13/14 19:36:14)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/13/14 20:40:32)
Message:

Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'

Conflicts:

common.mak
configure
libavdevice/Makefile
libavfilter/Makefile

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

(No files)

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