Changeset c867be03 in ffmpeg

Timestamp:

May 23, 2014, 5:01:12 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4e4dbb99

Parents:

6a4832ca (diff), 6b7b8585 (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 '6b7b8585d73548f08b98959df39d80b97677662f'

• commit '6b7b8585d73548f08b98959df39d80b97677662f': dca: Convert dca_dmixtable to integers

Conflicts:

libavcodec/dcadec.c

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

(No files)