[SCM] libav/experimental: Fix compilation of binkaudio_rdft when dct is disabled

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e0ae359115aa6ef7f5c4e253811598e07679b16a
Author: Daniel Verkamp <daniel at drv.nu>
Date:   Fri Feb 19 20:51:12 2010 +0000

    Fix compilation of binkaudio_rdft when dct is disabled
    
    Originally committed as revision 21903 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c
index 1e71cd8..1aca5bc 100644
--- a/libavcodec/binkaudio.c
+++ b/libavcodec/binkaudio.c
@@ -122,10 +122,12 @@ static av_cold int decode_init(AVCodecContext *avctx)
     for (i = 0; i < s->channels; i++)
         s->coeffs_ptr[i] = s->coeffs + i * s->frame_len;
 
-    if (avctx->codec->id == CODEC_ID_BINKAUDIO_RDFT)
+    if (CONFIG_BINKAUDIO_RDFT_DECODER && avctx->codec->id == CODEC_ID_BINKAUDIO_RDFT)
         ff_rdft_init(&s->trans.rdft, frame_len_bits, IRIDFT);
-    else
+    else if (CONFIG_BINKAUDIO_DCT_DECODER)
         ff_dct_init(&s->trans.dct, frame_len_bits, 0);
+    else
+        return -1;
 
     return 0;
 }
@@ -209,9 +211,9 @@ static void decode_block(BinkAudioContext *s, short *out, int use_dct)
             }
         }
 
-        if (use_dct)
+        if (CONFIG_BINKAUDIO_DCT_DECODER && use_dct)
             ff_dct_calc (&s->trans.dct,  coeffs);
-        else
+        else if (CONFIG_BINKAUDIO_RDFT_DECODER)
             ff_rdft_calc(&s->trans.rdft, coeffs);
     }
 
@@ -235,9 +237,9 @@ static av_cold int decode_end(AVCodecContext *avctx)
 {
     BinkAudioContext * s = avctx->priv_data;
     av_freep(&s->bands);
-    if (avctx->codec->id == CODEC_ID_BINKAUDIO_RDFT)
+    if (CONFIG_BINKAUDIO_RDFT_DECODER && avctx->codec->id == CODEC_ID_BINKAUDIO_RDFT)
         ff_rdft_end(&s->trans.rdft);
-    else
+    else if (CONFIG_BINKAUDIO_DCT_DECODER)
         ff_dct_end(&s->trans.dct);
     return 0;
 }

-- 
Libav/FFmpeg packaging