diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 02:40:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 02:49:22 +0100 |
| commit | 815daf1607b0dc5e471a0de1132767f60c8a6fd2 (patch) | |
| tree | cf7b2e49fa673ef6452709fb9037f150da96eb93 /ffserver_config.c | |
| parent | 9d4f8366271ec98a07c805432775368825b9fbe5 (diff) | |
| parent | 3a651f599a18b023602370b67a77eb0efa309b20 (diff) | |
| download | ffmpeg-815daf1607b0dc5e471a0de1132767f60c8a6fd2.tar.gz | |
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>
Diffstat (limited to 'ffserver_config.c')
0 files changed, 0 insertions, 0 deletions