diff options
| author | Michael Niedermayer <[email protected]> | 2014-04-21 17:13:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-04-21 17:13:58 +0200 |
| commit | 10b8ae5b108d99e24cc8777f3a5e6f1e5dc509b3 (patch) | |
| tree | 02b3566dce08f69c834affedd4e1c7c1dec3f14e | |
| parent | 63b38d4a91818c6aa6e842c9df7f27362b1223fa (diff) | |
| parent | dccac759d39e761398d3d4172ae0b98c0186efa5 (diff) | |
Merge commit 'dccac759d39e761398d3d4172ae0b98c0186efa5' into release/1.1
* commit 'dccac759d39e761398d3d4172ae0b98c0186efa5':
lavr: allocate the resampling buffer with a positive size
Merged-by: Michael Niedermayer <[email protected]>
| -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 7878cd2374..31a2f37d53 100644 --- a/libavresample/utils.c +++ b/libavresample/utils.c @@ -117,7 +117,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); |