From 0a06e6e49b9b50d74dee2506139076bfe3606834 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 13 Jul 2013 20:58:18 +0200 Subject: [PATCH] av_frame_get_buffer: Do not fail when the channel layout is unknown Fixes handling of cases with unknown layouts but known channel counts Signed-off-by: Michael Niedermayer --- libavutil/frame.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index 7584ae3587..3141dec72e 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -223,7 +223,7 @@ int av_frame_get_buffer(AVFrame *frame, int align) if (frame->width > 0 && frame->height > 0) return get_video_buffer(frame, align); - else if (frame->nb_samples > 0 && frame->channel_layout) + else if (frame->nb_samples > 0 && (frame->channel_layout || frame->channels > 0)) return get_audio_buffer(frame, align); return AVERROR(EINVAL);