lavfi/blackdetect: switch to new ff_filter_frame() API

[ffmpeg] / libavfilter / avcodec.c

diff --git a/libavfilter/avcodec.c b/libavfilter/avcodec.c
index c9c8f3c1c193b8ca6093545e2579307c365c2bec..688f1b397aaeda68ea9862403f1c966856b60f0f 100644 (file)
--- a/libavfilter/avcodec.c
+++ b/libavfilter/avcodec.c
@@ -60,8 +60,9 @@ int avfilter_copy_frame_props(AVFilterBufferRef *dst, const AVFrame *src)
     case AVMEDIA_TYPE_AUDIO:
         dst->audio->sample_rate         = src->sample_rate;
         dst->audio->channel_layout      = src->channel_layout;
-        if(src->channels != av_get_channel_layout_nb_channels(src->channel_layout)) {
-            av_log(0, AV_LOG_ERROR, "libavfilter does not support this channel layout\n");
+        dst->audio->channels            = src->channels;
+        if(src->channels < av_get_channel_layout_nb_channels(src->channel_layout)) {
+            av_log(NULL, AV_LOG_ERROR, "libavfilter does not support this channel layout\n");
             return AVERROR(EINVAL);
         }
         break;
@@ -161,6 +162,7 @@ int avfilter_copy_buf_props(AVFrame *dst, const AVFilterBufferRef *src)
         dst->nb_samples          = src->audio->nb_samples;
         av_frame_set_sample_rate   (dst, src->audio->sample_rate);
         av_frame_set_channel_layout(dst, src->audio->channel_layout);
+        av_frame_set_channels      (dst, src->audio->channels);
         break;
     default:
         return AVERROR(EINVAL);