Changeset 9d8e8495 in ffmpeg

Timestamp:

Oct 4, 2013, 12:36:58 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

719b4eef

Parents:

74b2b0ed (diff), 6cc133ec (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> (10/04/13 12:36:36)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/04/13 12:36:58)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: x86: fdct: Only build fdct code if encoders have been enabled

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

(No files)