diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 14:28:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 14:33:42 +0200 |
| commit | c11aa9d29aaea7a9f6952d17707eb549fd32c65e (patch) | |
| tree | c41bae45b1f42bd4ba9965f1e1f8b6f15cc69c7d | |
| parent | c955525f724d8ea160ed174b6243ba7f4cadcc85 (diff) | |
| parent | ac976ed91e323754e9a84509873ebdb437372797 (diff) | |
| download | ffmpeg-c11aa9d29aaea7a9f6952d17707eb549fd32c65e.tar.gz | |
Merge commit 'ac976ed91e323754e9a84509873ebdb437372797'
* commit 'ac976ed91e323754e9a84509873ebdb437372797':
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); |