diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2012-04-28 00:41:01 +0200 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2012-04-28 18:48:12 +0200 |
| commit | 75d5624cb25764c7f690cf4d13f6bcd94d4876a3 (patch) | |
| tree | 1e486b8c9b7893451d416e052b949c601d729086 /libavfilter | |
| parent | 832c3b10d239582d332cc949ef17142cec86d843 (diff) | |
avfilter: filter_samples: read pts before filtering.
The call to the next filter_sample will likely unref the
current buffer, so it is not possible to read it afterwards.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avfilter.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 6bc66d0248..d71ffdc620 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -570,11 +570,11 @@ int avfilter_poll_frame(AVFilterLink *link) return min; } -static void update_link_current_pts(AVFilterLink *link) +static void update_link_current_pts(AVFilterLink *link, int64_t pts) { - if (link->cur_buf->pts == AV_NOPTS_VALUE) + if (pts == AV_NOPTS_VALUE) return; - link->current_pts = link->cur_buf->pts; /* TODO use duration */ + link->current_pts = pts; /* TODO use duration */ if (link->graph && link->age_index >= 0) ff_avfilter_graph_update_heap(link->graph, link); } @@ -619,7 +619,7 @@ void avfilter_start_frame(AVFilterLink *link, AVFilterBufferRef *picref) } start_frame(link, link->cur_buf); - update_link_current_pts(link); + update_link_current_pts(link, link->cur_buf->pts); } void avfilter_end_frame(AVFilterLink *link) @@ -696,6 +696,7 @@ void avfilter_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref) void (*filter_samples)(AVFilterLink *, AVFilterBufferRef *); AVFilterPad *dst = link->dstpad; int i; + int64_t pts; FF_DPRINTF_START(NULL, filter_samples); ff_dlog_link(NULL, link, 1); @@ -723,8 +724,9 @@ void avfilter_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref) } else link->cur_buf = samplesref; + pts = link->cur_buf->pts; filter_samples(link, link->cur_buf); - update_link_current_pts(link); + update_link_current_pts(link, pts); } #define MAX_REGISTERED_AVFILTERS_NB 128 |