Michael Niedermayer 815daf1607 Merge commit '3a651f599a18b023602370b67a77eb0efa309b20' ...

* commit '3a651f599a18b023602370b67a77eb0efa309b20':
  dca: Move data tables from a header to an object file

Conflicts:
	libavcodec/Makefile
	libavcodec/dcadata.h
	libavcodec/dcadec.c

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

2015-02-16 02:49:22 +01:00

351 KiB

Raw Blame History

View Raw