diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 20:14:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 20:14:18 +0200 |
| commit | b34fce9c5470ac5a5d7cd3bb522768e6df1e4c3a (patch) | |
| tree | 481599e6559d52416cb5d022a7ff676fd1fad61f | |
| parent | 742f9aa8792827fe8718247045ab64401c42e46e (diff) | |
| parent | 9d02e38d3f03100784348ff75fd181d2aaad7e43 (diff) | |
| download | ffmpeg-b34fce9c5470ac5a5d7cd3bb522768e6df1e4c3a.tar.gz | |
Merge commit '9d02e38d3f03100784348ff75fd181d2aaad7e43' into release/2.2
* commit '9d02e38d3f03100784348ff75fd181d2aaad7e43':
lavr: allocate the resampling buffer with a positive size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavresample/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavresample/utils.c b/libavresample/utils.c index 551a7e075e..3a335c0587 100644 --- a/libavresample/utils.c +++ b/libavresample/utils.c @@ -189,7 +189,7 @@ int avresample_open(AVAudioResampleContext *avr) } if (avr->resample_needed) { avr->resample_out_buffer = ff_audio_data_alloc(avr->out_channels, - 0, avr->internal_sample_fmt, + 1024, avr->internal_sample_fmt, "resample_out_buffer"); if (!avr->resample_out_buffer) { ret = AVERROR(EINVAL); |