[FFmpeg-devel] [PATCH 3/6] lavfi: fix invalid channel layouts.

Nicolas George nicolas.george at normalesup.org
Wed Nov 28 16:14:18 CET 2012


Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
---
 libavfilter/avcodec.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavfilter/avcodec.c b/libavfilter/avcodec.c
index 688f1b3..34e1094 100644
--- a/libavfilter/avcodec.c
+++ b/libavfilter/avcodec.c
@@ -61,10 +61,7 @@ int avfilter_copy_frame_props(AVFilterBufferRef *dst, const AVFrame *src)
         dst->audio->sample_rate         = src->sample_rate;
         dst->audio->channel_layout      = src->channel_layout;
         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);
-        }
+        av_channel_layout_fix(src->channels, &dst->audio->channel_layout);
         break;
     default:
         return AVERROR(EINVAL);
-- 
1.7.10.4



More information about the ffmpeg-devel mailing list