Commit c0dc57f1 authored by Justin Ruggles's avatar Justin Ruggles
Browse files

asyncts: merge two conditions

parent 0995ad8d
...@@ -196,19 +196,14 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf) ...@@ -196,19 +196,14 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
int out_size, ret; int out_size, ret;
int64_t delta; int64_t delta;
/* buffer data until we get the first timestamp */ /* buffer data until we get the next timestamp */
if (s->pts == AV_NOPTS_VALUE) { if (s->pts == AV_NOPTS_VALUE || pts == AV_NOPTS_VALUE) {
if (pts != AV_NOPTS_VALUE) { if (pts != AV_NOPTS_VALUE) {
s->pts = pts - get_delay(s); s->pts = pts - get_delay(s);
} }
return write_to_fifo(s, buf); 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) { if (s->first_pts != AV_NOPTS_VALUE) {
handle_trimming(ctx); handle_trimming(ctx);
if (!avresample_available(s->avr)) if (!avresample_available(s->avr))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment