From c0dc57f1264dad1e121772d03abdb9e14ed8857f Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Thu, 13 Dec 2012 13:20:51 -0500 Subject: asyncts: merge two conditions --- libavfilter/af_asyncts.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'libavfilter/af_asyncts.c') diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c index faefdf4be7..d6d893210c 100644 --- a/libavfilter/af_asyncts.c +++ b/libavfilter/af_asyncts.c @@ -196,19 +196,14 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf) int out_size, ret; int64_t delta; - /* buffer data until we get the first timestamp */ - if (s->pts == AV_NOPTS_VALUE) { + /* buffer data until we get the next timestamp */ + if (s->pts == AV_NOPTS_VALUE || pts == AV_NOPTS_VALUE) { if (pts != AV_NOPTS_VALUE) { s->pts = pts - get_delay(s); } return write_to_fifo(s, buf); } - /* now wait for the next timestamp */ - if (pts == AV_NOPTS_VALUE) { - return write_to_fifo(s, buf); - } - if (s->first_pts != AV_NOPTS_VALUE) { handle_trimming(ctx); if (!avresample_available(s->avr)) -- cgit v1.2.3