RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libspeexenc: Use speex_lib_get_mode instead of the speex_foo_mode data symbols 

This avoids issues linking to a DLL version of libspeex, since the
libspeex headers lack proper dllimport declarations for the data
symbols.

This isn't an issue when building with mingw with GNU binutils, since
GNU ld can fix up that kind of data import automatically.

libspeexdec.c already uses speex_lib_get_mode as well.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2017-11-03 11:36:49 +02:00
parent 2cf3c0ab0d
commit 1746c7c8f2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/libspeexenc.c
View File

@ -158,9 +158,9 @@ static av_cold int encode_init(AVCodecContext *avctx)
/* sample rate and encoding mode */
switch (avctx->sample_rate) {
case 8000: mode = &speex_nb_mode; break;
case 16000: mode = &speex_wb_mode; break;
case 32000: mode = &speex_uwb_mode; break;
case 8000: mode = speex_lib_get_mode(SPEEX_MODEID_NB); break;
case 16000: mode = speex_lib_get_mode(SPEEX_MODEID_WB); break;
case 32000: mode = speex_lib_get_mode(SPEEX_MODEID_UWB); break;
default:
av_log(avctx, AV_LOG_ERROR, "Sample rate of %d Hz is not supported. "
"Resample to 8, 16, or 32 kHz.\n", avctx->sample_rate);