summaryrefslogtreecommitdiff
path: root/libavutil/frame.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-13 20:58:18 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-13 21:09:20 +0200
commit0a06e6e49b9b50d74dee2506139076bfe3606834 (patch)
treee0158199bacb9fbd1c9b83198760bea374660717 /libavutil/frame.c
parent289737c8be2898edc2455b2f15816cf5a0777dc4 (diff)
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 <michaelni@gmx.at>
Diffstat (limited to 'libavutil/frame.c')
-rw-r--r--libavutil/frame.c2
1 files changed, 1 insertions, 1 deletions
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);