1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00

Merge commit '1746c7c8f2f9a6c5eacb486426dd0a579b4b7498'

* commit '1746c7c8f2f9a6c5eacb486426dd0a579b4b7498':
  libspeexenc: Use speex_lib_get_mode instead of the speex_foo_mode data symbols

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-11-12 00:44:26 -03:00
commit a629bc99fd

View File

@ -159,9 +159,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);