summaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-14 15:42:58 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-14 15:43:46 +0100
commita01fe55077d9627519930ad3e18d79a6682f6132 (patch)
treec2b205aa14d0c7e32bb73d5fa6ca3f1511d1680f /libavfilter
parent2f265d9087362c17920e4bce59b21653f3fffbfe (diff)
parentc0dc57f1264dad1e121772d03abdb9e14ed8857f (diff)
downloadffmpeg-streaming-a01fe55077d9627519930ad3e18d79a6682f6132.zip
ffmpeg-streaming-a01fe55077d9627519930ad3e18d79a6682f6132.tar.gz
Merge commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f'
* commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f': asyncts: merge two conditions x86inc: fully concatenate tokens to fix macro expansion for nasm h264: initialize frame-mt context copies properly Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/af_asyncts.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c
index d3123f5..fb3377c 100644
--- a/libavfilter/af_asyncts.c
+++ b/libavfilter/af_asyncts.c
@@ -190,19 +190,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))
OpenPOWER on IntegriCloud