Changeset 90f674d5 in ffmpeg

Timestamp:

Feb 28, 2014, 5:14:12 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

16924311

Parents:

810eb285 (diff), 87ec849f (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 '87ec849fe9acba075c843e67bcd01f256f481a18'

• commit '87ec849fe9acba075c843e67bcd01f256f481a18': dcadec: remove scaling in lfe_interpolation_fir

Conflicts:

libavcodec/dcadec.c
libavcodec/dcadsp.c

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

(No files)