virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

get_audio_buffer: fix usage where channels are not set but layout is

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-27 10:52:26 +01:00
parent 02abc905cd
commit 60b099c371
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavutil/frame.c
View File

@ -183,11 +183,17 @@ fail:
static int get_audio_buffer(AVFrame *frame, int align) static int get_audio_buffer(AVFrame *frame, int align)
{ {
int channels = frame->channels; int channels;
int planar = av_sample_fmt_is_planar(frame->format); int planar = av_sample_fmt_is_planar(frame->format);
int planes = planar ? channels : 1; int planes;
int ret, i; int ret, i;
if (!frame->channels)
frame->channels = av_get_channel_layout_nb_channels(frame->channel_layout);
channels = frame->channels;
planes = planar ? channels : 1;
CHECK_CHANNELS_CONSISTENCY(frame); CHECK_CHANNELS_CONSISTENCY(frame);
if (!frame->linesize[0]) { if (!frame->linesize[0]) {
ret = av_samples_get_buffer_size(&frame->linesize[0], channels, ret = av_samples_get_buffer_size(&frame->linesize[0], channels,