Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / gsmdec.c

diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c
index 0b39e0a8dd0c89e629ad8f0189b395960a7144b4..1bf3f33913d9bb47c9c1374e1e8dc99efc6a7da3 100644 (file)
--- a/libavcodec/gsmdec.c
+++ b/libavcodec/gsmdec.c
@@ -105,6 +105,7 @@ static void gsm_flush(AVCodecContext *avctx)
     memset(s, 0, sizeof(*s));
 }
 
+#if CONFIG_GSM_DECODER
 AVCodec ff_gsm_decoder = {
     .name           = "gsm",
     .type           = AVMEDIA_TYPE_AUDIO,
@@ -116,7 +117,8 @@ AVCodec ff_gsm_decoder = {
     .capabilities   = CODEC_CAP_DR1,
     .long_name      = NULL_IF_CONFIG_SMALL("GSM"),
 };
-
+#endif
+#if CONFIG_GSM_MS_DECODER
 AVCodec ff_gsm_ms_decoder = {
     .name           = "gsm_ms",
     .type           = AVMEDIA_TYPE_AUDIO,
@@ -128,3 +130,4 @@ AVCodec ff_gsm_ms_decoder = {
     .capabilities   = CODEC_CAP_DR1,
     .long_name      = NULL_IF_CONFIG_SMALL("GSM Microsoft variant"),
 };
+#endif