diff options
author | Martin Storsjö <martin@martin.st> | 2017-11-03 11:36:49 +0200 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2017-11-04 00:01:15 +0200 |
commit | 1746c7c8f2f9a6c5eacb486426dd0a579b4b7498 (patch) | |
tree | 94e15d1835983f933f89f8ab5c4a7afe8cebc565 | |
parent | 2cf3c0ab0d84b5cdb379059f8570809a13a306b9 (diff) | |
download | ffmpeg-streaming-1746c7c8f2f9a6c5eacb486426dd0a579b4b7498.zip ffmpeg-streaming-1746c7c8f2f9a6c5eacb486426dd0a579b4b7498.tar.gz |
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>
-rw-r--r-- | libavcodec/libspeexenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/libspeexenc.c b/libavcodec/libspeexenc.c index f3a31e9..eb02e8e 100644 --- a/libavcodec/libspeexenc.c +++ b/libavcodec/libspeexenc.c @@ -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); |