diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-18 12:15:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-18 12:15:12 +0100 |
| commit | ab213b5360e82fca707197f3224a85695645d81d (patch) | |
| tree | 1ea4264228a68158226bc07a7564ade5a172400b /ffserver.c | |
| parent | 4ff0e63a015a5f88e514b924221c89b690565a2d (diff) | |
| parent | e6bda9a9fd86505927a2e095e495eae104860701 (diff) | |
| download | ffmpeg-ab213b5360e82fca707197f3224a85695645d81d.tar.gz | |
Merge commit 'e6bda9a9fd86505927a2e095e495eae104860701'
* commit 'e6bda9a9fd86505927a2e095e495eae104860701':
libopencore-amr: Conditionally compile decoder and encoder bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions