Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libswresample / swresample_test.c

diff --git a/libswresample/swresample_test.c b/libswresample/swresample_test.c
index 363614780bfbf0c66084cd75c260c6c65fd3e286..d41b964ba4cca43ab58e29890a9e0afdffa1e27c 100644 (file)
--- a/libswresample/swresample_test.c
+++ b/libswresample/swresample_test.c
@@ -28,7 +28,7 @@
 
 #define ASSERT_LEVEL 2
 
-static double get(const uint8_t *a[], int ch, int index, int ch_count, enum AVSampleFormat f){
+static double get(uint8_t *a[], int ch, int index, int ch_count, enum AVSampleFormat f){
     const uint8_t *p;
     if(av_sample_fmt_is_planar(f)){
         f= av_get_alt_sample_fmt(f, 0);
@@ -119,12 +119,13 @@ int main(int argc, char **argv){
         for(in_sample_fmt= AV_SAMPLE_FMT_U8; in_sample_fmt<=AV_SAMPLE_FMT_DBL; in_sample_fmt++){
             for(out_sample_fmt= AV_SAMPLE_FMT_U8; out_sample_fmt<=AV_SAMPLE_FMT_DBL; out_sample_fmt++){
                 for(in_ch_layout_index=0; layouts[in_ch_layout_index]; in_ch_layout_index++){
+                    int in_ch_count;
                     in_ch_layout= layouts[in_ch_layout_index];
-                    int in_ch_count= av_get_channel_layout_nb_channels(in_ch_layout);
+                    in_ch_count= av_get_channel_layout_nb_channels(in_ch_layout);
                     for(out_ch_layout_index=0; layouts[out_ch_layout_index]; out_ch_layout_index++){
-                        int out_count, mid_count;
+                        int out_count, mid_count, out_ch_count;
                         out_ch_layout= layouts[out_ch_layout_index];
-                        int out_ch_count= av_get_channel_layout_nb_channels(out_ch_layout);
+                        out_ch_count= av_get_channel_layout_nb_channels(out_ch_layout);
                         fprintf(stderr, "ch %d->%d, rate:%5d->%5d, fmt:%s->%s",
                                in_ch_count, out_ch_count,
                                in_sample_rate, out_sample_rate,