[SCM] libav/experimental: dca: avoid C99 declaration in for() expression

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:23:02 UTC 2013


The following commit has been merged in the experimental branch:
commit e86e858111501650bb9ce8e39282e20c57bac913
Author: Gianluigi Tiesi <mplayer at netfarm.it>
Date:   Tue Feb 1 04:12:26 2011 +0000

    dca: avoid C99 declaration in for() expression
    
    Signed-off-by: Mans Rullgard <mans at mansr.com>

diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index 3861813..3a3eb25 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -1354,7 +1354,9 @@ static int dca_exss_mask2count(int mask)
  */
 static void dca_exss_skip_mix_coeffs(GetBitContext *gb, int channels, int out_ch)
 {
-    for (int i = 0; i < channels; i++) {
+    int i;
+
+    for (i = 0; i < channels; i++) {
         int mix_map_mask = get_bits(gb, out_ch);
         int num_coeffs = av_popcount(mix_map_mask);
         skip_bits_long(gb, num_coeffs * 6);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list