Merge commit '3a651f599a18b023602370b67a77eb0efa309b20'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Feb 2015 01:40:26 +0000 (02:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Feb 2015 01:49:22 +0000 (02:49 +0100)
commit815daf1607b0dc5e471a0de1132767f60c8a6fd2
treecf7b2e49fa673ef6452709fb9037f150da96eb93
parent9d4f8366271ec98a07c805432775368825b9fbe5
parent3a651f599a18b023602370b67a77eb0efa309b20
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>
libavcodec/Makefile
libavcodec/dcadata.c
libavcodec/dcadata.h
libavcodec/dcadec.c
libavcodec/dcaenc.c