From 55b58598676d192d62ceb54a4be173ea22c0739e Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 6 Mar 2009 00:14:44 +0000 Subject: Merge ff_timefilter_read() and ff_timefilter_update(), this simplifies API and avoids calling them in the wrong order. Originally committed as revision 17841 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/timefilter.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'libavformat/timefilter.c') diff --git a/libavformat/timefilter.c b/libavformat/timefilter.c index 26d57c0..a90371f 100644 --- a/libavformat/timefilter.c +++ b/libavformat/timefilter.c @@ -53,7 +53,7 @@ void ff_timefilter_reset(TimeFilter *self) self->cycle_time = 0; } -void ff_timefilter_update(TimeFilter *self, double system_time, double period) +double ff_timefilter_update(TimeFilter *self, double system_time, double period) { if (!self->cycle_time) { /// init loop @@ -68,9 +68,5 @@ void ff_timefilter_update(TimeFilter *self, double system_time, double period) self->cycle_time += self->feedback2_factor * loop_error; self->integrator2_state += self->feedback3_factor * loop_error / period; } -} - -double ff_timefilter_read(TimeFilter *self) -{ return self->cycle_time; } -- cgit v1.1