Changeset 43ec4563 in ffmpeg

Timestamp:

Nov 29, 2013, 2:28:15 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

12235a3e

Parents:

c122e697 (diff), 44b17d79 (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> (11/29/13 00:53:58)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/29/13 02:28:15)

Message:

Merge commit '44b17d794aa508ae21f438ae80bfe8aaf4b426e1'

• commit '44b17d794aa508ae21f438ae80bfe8aaf4b426e1': dca: extract core substream's embedded downmix coeffcient codes, if present.

Conflicts:

libavcodec/dcadata.h
libavcodec/dcadec.c

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

(No files)