diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 02:29:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 02:29:41 +0100 |
| commit | 9d4f8366271ec98a07c805432775368825b9fbe5 (patch) | |
| tree | a16e353c40204810d41410764ff541bc1d8ef630 /ffserver_config.c | |
| parent | e86f754b1c5f1e0d2e04e2f2c20885706ae50366 (diff) | |
| parent | 65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda (diff) | |
| download | ffmpeg-9d4f8366271ec98a07c805432775368825b9fbe5.tar.gz | |
Merge commit '65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda'
* commit '65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda':
dca: Add array sizes to array declarations
Conflicts:
libavcodec/dcadata.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver_config.c')
0 files changed, 0 insertions, 0 deletions