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);