Changeset a7f88177 in ffmpeg

Timestamp:

Nov 28, 2013, 11:32:14 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c122e697

Parents:

e9a47896 (diff), b6d5e6aa (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.

Message:

Merge commit 'b6d5e6aa10a2f09351f287e876f7ed4504e1f75d'

• commit 'b6d5e6aa10a2f09351f287e876f7ed4504e1f75d': dca: convert dca_default_coeffs to float.

Conflicts:

libavcodec/dcadata.h

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

(No files)