Changeset df98b36a in ffmpeg

Timestamp:

Feb 8, 2014, 4:25:31 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

aedc1013

Parents:

3a0e4f6c (diff), 5c1c6e82 (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/08/14 16:25:26)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/08/14 16:25:31)

Message:

Merge commit '5c1c6e82261b856214499b9fef3a08bf3ff6e0ae'

• commit '5c1c6e82261b856214499b9fef3a08bf3ff6e0ae': dca: include dcadsp.h in {arm,x86}/dca.h for checkheaders

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

(No files)