diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 11:45:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 12:05:19 +0200 |
| commit | 614cf1a6133a143961798c5d87c9bffc2ca0da9e (patch) | |
| tree | bd72a843fa20e50578e1c8a8231262150136b322 /libavcodec/cos_tablegen.c | |
| parent | b69b075ac607419a840da798b089de8ea7630d4b (diff) | |
| parent | 4f2b469da5e4ae221718ae479f6af627cfdebb91 (diff) | |
| download | ffmpeg-614cf1a6133a143961798c5d87c9bffc2ca0da9e.tar.gz | |
Merge commit '4f2b469da5e4ae221718ae479f6af627cfdebb91'
* commit '4f2b469da5e4ae221718ae479f6af627cfdebb91':
Add a libfdk-aac decoder
Conflicts:
configure
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cos_tablegen.c')
0 files changed, 0 insertions, 0 deletions