Changeset 61ad2b42 in ffmpeg

Timestamp:

Mar 18, 2014, 6:59:00 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

7ab315ec

Parents:

ae9b468b (diff), d961a79e (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/18/14 18:58:18)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/18/14 18:59:00)

Message:

Merge commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1'

• commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1': sbrdsp: move #if to disable all educational code

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

(No files)