Changeset c74b3983 in ffmpeg

Timestamp:
Feb 13, 2015, 10:54:38 AM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
3e27149
Parents:
8bb489f (diff), faa8ffda (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> (02/13/15 10:51:25)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (02/13/15 10:54:38)
Message:

Merge commit 'faa8ffda2c513573733624784f0a7d0a4959d33e'

Conflicts:

doc/APIchanges

See: c651a1aaecb5cb7bb40cf40df27f5273e8bcd245
See: 8c8ee17e8d2800144116ec52f26a435a06b49420 and others
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)

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