jpeg2000: enable 4 component pixel formats

[ffmpeg] / libavresample / avresample-test.c

diff --git a/libavresample/avresample-test.c b/libavresample/avresample-test.c
index ad2f16d6f60ffee5e17188a835fd412a88e76107..697b4ba799034ba44310a987e52b34f2a0bb85ad 100644 (file)
--- a/libavresample/avresample-test.c
+++ b/libavresample/avresample-test.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 
 #include "libavutil/avstring.h"
+#include "libavutil/common.h"
 #include "libavutil/lfg.h"
 #include "libavutil/libm.h"
 #include "libavutil/log.h"
@@ -90,7 +91,7 @@ static void audiogen(AVLFG *rnd, void **data, enum AVSampleFormat sample_fmt,
 
     k = 0;
 
-    /* 1 second of single freq sinus at 1000 Hz */
+    /* 1 second of single freq sine at 1000 Hz */
     a = 0;
     for (i = 0; i < 1 * sample_rate && k < nb_samples; i++, k++) {
         v = sin(a) * 0.30;
@@ -99,7 +100,7 @@ static void audiogen(AVLFG *rnd, void **data, enum AVSampleFormat sample_fmt,
         a += M_PI * 1000.0 * 2.0 / sample_rate;
     }
 
-    /* 1 second of varing frequency between 100 and 10000 Hz */
+    /* 1 second of varying frequency between 100 and 10000 Hz */
     a = 0;
     for (i = 0; i < 1 * sample_rate && k < nb_samples; i++, k++) {
         v = sin(a) * 0.30;
@@ -304,8 +305,8 @@ int main(int argc, char **argv)
                                 goto end;
                             }
 
-                            ret = avresample_convert(s, (void **)out_data, out_linesize, out_rate * 6,
-                                                        (void **) in_data,  in_linesize,  in_rate * 6);
+                            ret = avresample_convert(s, out_data, out_linesize, out_rate * 6,
+                                                         in_data,  in_linesize,  in_rate * 6);
                             if (ret < 0) {
                                 char errbuf[256];
                                 av_strerror(ret, errbuf, sizeof(errbuf));