Michael Niedermayer d2668ae472 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>

2015-02-17 20:18:19 +01:00

9.9 KiB

Raw Blame History

View Raw