Changeset d2223ec2 in ffmpeg

Timestamp:

Feb 14, 2015, 9:40:35 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

dfa7cb64

Parents:

6c44dd6c (diff), 2a9c6fae (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 '2a9c6fae927964b5dd0b5d3d9292f5621bd21664'

• commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664': dca: Move all tables into dcadata.h

Conflicts:

libavcodec/dcadec.c

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

(No files)