Changeset 0371eae in ffmpeg

Timestamp:

Mar 26, 2014, 1:50:55 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e9c6b93b

Parents:

32620691 (diff), aba70bb5 (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/26/14 13:50:47)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/26/14 13:50:55)

Message:

Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'

• commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f': Add missing headers to make template files compile (more) standalone

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

(No files)