Changeset 9d4dece6 in ffmpeg

Timestamp:
Jul 22, 2013, 8:56:33 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
0129026c
Parents:
2ca6a13b (diff), 8000206a (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> (07/22/13 08:53:54)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (07/22/13 08:56:33)
Message:

Merge commit '8000206abcc82491c2a8c71e494c5477ede7264c'

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

(No files)

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