diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-07 13:37:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-07 13:50:24 +0200 |
| commit | fa8511851090537f6898fc50d7e6cf56841cf6ab (patch) | |
| tree | cc6e217fd99f5080a4726e1c74a6840962e1ff80 /libavfilter/af_asyncts.c | |
| parent | a7fbc7d7b7eabc74ceb1970a995c56043315e433 (diff) | |
| parent | 9afb7061f938831248942050cfdb449e014ed427 (diff) | |
| download | ffmpeg-fa8511851090537f6898fc50d7e6cf56841cf6ab.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mov_chan: Pass a separate AVIOContext for reading
af_asyncts: check return value from lavr when flushing.
mss2: simplify loop in decode_rle()
mss12: avoid unnecessary division in arith*_get_bit()
mss2: do not try to read too many palette entries
mpegvideo: set AVFrame fields to NULL after freeing the base memory
configure: Set the right cc_e flags for msvc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_asyncts.c')
| -rw-r--r-- | libavfilter/af_asyncts.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c index 0ecaf52ee8..18892d4826 100644 --- a/libavfilter/af_asyncts.c +++ b/libavfilter/af_asyncts.c @@ -127,8 +127,13 @@ static int request_frame(AVFilterLink *link) nb_samples); if (!buf) return AVERROR(ENOMEM); - avresample_convert(s->avr, (void**)buf->extended_data, buf->linesize[0], - nb_samples, NULL, 0, 0); + ret = avresample_convert(s->avr, (void**)buf->extended_data, + buf->linesize[0], nb_samples, NULL, 0, 0); + if (ret <= 0) { + avfilter_unref_bufferp(&buf); + return (ret < 0) ? ret : AVERROR_EOF; + } + buf->pts = s->pts; return ff_filter_samples(link, buf); } |