Merge commit '3a651f599a18b023602370b67a77eb0efa309b20'

Browse Source

* 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>

...

This commit is contained in:

Michael Niedermayer

2015-02-16 02:40:26 +01:00

parent 9d4f836627 3a651f599a

commit 815daf1607

5 changed files with 7917 additions and 7855 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

7826

libavcodec/dcadata.h

File diff suppressed because it is too large Load Diff