@@ -89,8 +89,8 @@ static int query_formats(AVFilterContext *ctx)

     AVFilterChannelLayouts *layouts = NULL;

     AVFilterLink *inlink = ctx->inputs[0];

     AVFilterLink *outlink = ctx->outputs[0];

-    static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_S16P, -1 };

-    static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_RGB24, -1 };

+    static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE };

+    static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_RGB24, AV_PIX_FMT_NONE };

     /* set input audio formats */

     formats = ff_make_format_list(sample_fmts);

@@ -87,8 +87,8 @@ static int query_formats(AVFilterContext *ctx)

     AVFilterChannelLayouts *layouts = NULL;

     AVFilterLink *inlink = ctx->inputs[0];

     AVFilterLink *outlink = ctx->outputs[0];

-    static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_S16, -1 };

-    static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_GRAY8, -1 };

+    static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE };

+    static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE };

     /* set input audio formats */

     formats = ff_make_format_list(sample_fmts);

@@ -649,9 +649,9 @@ static int query_formats(AVFilterContext *ctx)

     AVFilterLink *inlink = ctx->inputs[0];

     AVFilterLink *outlink = ctx->outputs[0];

-    static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_DBL, -1 };

+    static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_NONE };

     static const int input_srate[] = {48000, -1}; // ITU-R BS.1770 provides coeff only for 48kHz

-    static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_RGB24, -1 };

+    static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_RGB24, AV_PIX_FMT_NONE };

     /* set input audio formats */

     formats = ff_make_format_list(sample_fmts);

@@ -33,7 +33,7 @@

 AVBufferSinkParams *av_buffersink_params_alloc(void)

 {

-    static const int pixel_fmts[] = { -1 };

+    static const int pixel_fmts[] = { AV_PIX_FMT_NONE };

     AVBufferSinkParams *params = av_malloc(sizeof(AVBufferSinkParams));

     if (!params)

         return NULL;

@@ -44,7 +44,7 @@ AVBufferSinkParams *av_buffersink_params_alloc(void)

 AVABufferSinkParams *av_abuffersink_params_alloc(void)

 {

-    static const int sample_fmts[] = { -1 };

+    static const int sample_fmts[] = { AV_SAMPLE_FMT_NONE };

     static const int64_t channel_layouts[] = { -1 };

     AVABufferSinkParams *params = av_malloc(sizeof(AVABufferSinkParams));