diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-05 22:17:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-05 22:17:02 +0200 |
| commit | b4780d03d04d402b490be21b01ec886565cabe29 (patch) | |
| tree | 2c5605baa7b588cced8f79c2916eb724356d5c25 /libavfilter/audio.c | |
| parent | 69aeba1396d5a13e79cbc3cc9f49fd6896addb82 (diff) | |
| parent | 2096857551660649dbe9a5aad7338b0872858575 (diff) | |
| download | ffmpeg-b4780d03d04d402b490be21b01ec886565cabe29.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: h264_idct: Rename x264_add8x4_idct_sse2 --> h264_add8x4_idct_sse2
rational: add av_inv_q() returning the inverse of an AVRational
dpx: Make start offset unsigned
lavfi: properly signal out-of-memory error in ff_filter_samples
cosmetics: Fix a few switched periods and linebreaks
zerocodec: Fix memleak in decode_frame
zerocodec: Cosmetics
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/audio.c')
| -rw-r--r-- | libavfilter/audio.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavfilter/audio.c b/libavfilter/audio.c index f3eebbfdae..1a201e608b 100644 --- a/libavfilter/audio.c +++ b/libavfilter/audio.c @@ -178,6 +178,10 @@ int ff_filter_samples_framed(AVFilterLink *link, AVFilterBufferRef *samplesref) buf_out = ff_default_get_audio_buffer(link, dst->min_perms, samplesref->audio->nb_samples); + if (!buf_out) { + avfilter_unref_buffer(samplesref); + return AVERROR(ENOMEM); + } buf_out->pts = samplesref->pts; buf_out->audio->sample_rate = samplesref->audio->sample_rate; |