diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-19 10:25:26 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-19 10:26:07 +0200 |
commit | 8740762c43dc92cfefa58769bb8cfade82aa695c (patch) | |
tree | 1550bb212ec5689d8441dc60f3decb0a02e6058d /libavcodec/celp_math.c | |
parent | 454c89dde3afd8f84d2631dd87da47bf23de3fe3 (diff) | |
parent | d010e95f86089abe9a3d4d4a66ac8102312d28a4 (diff) | |
download | ffmpeg-8740762c43dc92cfefa58769bb8cfade82aa695c.tar.gz |
Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4'
* commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4':
avserver: Remove unused loadable module support
Conflicts:
configure
ffserver.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/celp_math.c')
0 files changed, 0 insertions, 0 deletions