Merge commit 'f8c1719771dc4ac2e13e6bc8bf741854a30e3a86'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 19:18:19 +0000 (20:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 19:18:19 +0000 (20:18 +0100)
commitd2668ae472690fe102b7c63fbddd716ebca25dd3
tree51af2a0dff0e63e0b2e6e4204664e3cd0e45ab0b
parent03dab49a1267630375c4fc15dec1136814b1f117
parentf8c1719771dc4ac2e13e6bc8bf741854a30e3a86
Merge commit 'f8c1719771dc4ac2e13e6bc8bf741854a30e3a86'

* commit 'f8c1719771dc4ac2e13e6bc8bf741854a30e3a86':
  dca: Remove separate header for DCA ExSS

Conflicts:
libavcodec/dca.h
libavcodec/dca_exss.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dca.h
libavcodec/dca_exss.c
libavcodec/dcadec.c