diff options
| author | Nicolas George <george@nsup.org> | 2015-09-24 09:30:05 +0200 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2015-12-22 15:55:00 +0100 |
| commit | d03eab34dd8a0da63591b1fbc56149595d3907f7 (patch) | |
| tree | f60838fc0f84308c30a59262b7f2af6b893b5b43 /libavfilter/avfiltergraph.c | |
| parent | 63f7bee75221a205c97e0c3948bc24906653e1b7 (diff) | |
| download | ffmpeg-d03eab34dd8a0da63591b1fbc56149595d3907f7.tar.gz | |
lavfi: rename link.current_pts to current_pts_us.
This field is used for fast comparison between link ages,
it is in AV_TIME_BASE units, in other words microseconds,
µs =~ us.
Renaming it allows a second field in link time base units.
Diffstat (limited to 'libavfilter/avfiltergraph.c')
| -rw-r--r-- | libavfilter/avfiltergraph.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index d749250444..ec2245f15b 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -1324,7 +1324,7 @@ static void heap_bubble_up(AVFilterGraph *graph, while (index) { int parent = (index - 1) >> 1; - if (links[parent]->current_pts >= link->current_pts) + if (links[parent]->current_pts_us >= link->current_pts_us) break; links[index] = links[parent]; links[index]->age_index = index; @@ -1346,9 +1346,9 @@ static void heap_bubble_down(AVFilterGraph *graph, if (child >= graph->sink_links_count) break; if (child + 1 < graph->sink_links_count && - links[child + 1]->current_pts < links[child]->current_pts) + links[child + 1]->current_pts_us < links[child]->current_pts_us) child++; - if (link->current_pts < links[child]->current_pts) + if (link->current_pts_us < links[child]->current_pts_us) break; links[index] = links[child]; links[index]->age_index = index; |