virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

asyncts: merge two conditions

Browse Source
This commit is contained in:
Justin Ruggles 2012-12-13 13:20:51 -05:00
parent 0995ad8db4
commit c0dc57f126
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavfilter/af_asyncts.c
View File

@ -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))