Changeset d2668ae4 in ffmpeg

Timestamp:
Feb 17, 2015, 7:18:19 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
d302853b
Parents:
03dab49a (diff), f8c17197 (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 'f8c1719771dc4ac2e13e6bc8bf741854a30e3a86'

Conflicts:

libavcodec/dca.h
libavcodec/dca_exss.h

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.