diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:53:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:56:56 +0100 |
| commit | be26232efa9543106bfc16f45831f69abaf1c552 (patch) | |
| tree | fdbd6091e41c1c50607350304fd43a6146dbc028 /libavfilter/af_asyncts.c | |
| parent | a01fe55077d9627519930ad3e18d79a6682f6132 (diff) | |
| parent | 07acdd651d1e2f4cfa5f610e616e70e323bb69cd (diff) | |
| download | ffmpeg-be26232efa9543106bfc16f45831f69abaf1c552.tar.gz | |
Merge commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd'
* commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd':
ivi_common: use proper logging context in ivi_decode_blocks().
ivi_common: make some functions and tables static.
asyncts: ignore min_delta only if first_pts is set
Conflicts:
libavcodec/ivi_common.c
libavcodec/ivi_common.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_asyncts.c')
| -rw-r--r-- | libavfilter/af_asyncts.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c index fb3377c642..500be0f73a 100644 --- a/libavfilter/af_asyncts.c +++ b/libavfilter/af_asyncts.c @@ -209,7 +209,8 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf) delta = pts - s->pts - get_delay(s); out_size = avresample_available(s->avr); - if (labs(delta) > s->min_delta || (s->first_frame && delta)) { + if (labs(delta) > s->min_delta || + (s->first_frame && delta && s->first_pts != AV_NOPTS_VALUE)) { av_log(ctx, AV_LOG_VERBOSE, "Discontinuity - %"PRId64" samples.\n", delta); out_size = av_clipl_int32((int64_t)out_size + delta); } else { |