diff options
| author | Mike Melanson <mike@multimedia.cx> | 2002-07-15 00:54:12 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2002-07-15 00:54:12 +0000 |
| commit | 9390fc8d754001d0ac9f804c12039b281635e8ee (patch) | |
| tree | ee7d25adfe5d9fe8fbd7f20dd05916997221ce82 | |
| parent | 5a47aa47798718be5961dfcfae8d9c61fe93792e (diff) | |
| download | xine-lib-9390fc8d754001d0ac9f804c12039b281635e8ee.tar.gz xine-lib-9390fc8d754001d0ac9f804c12039b281635e8ee.tar.bz2 | |
fixed so that small FLI files do not cause xine to report a demuxer
failure; also added running time to vital stats display
CVS patchset: 2269
CVS date: 2002/07/15 00:54:12
| -rw-r--r-- | src/demuxers/demux_fli.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c index c6fb59b7e..b1dad2ec4 100644 --- a/src/demuxers/demux_fli.c +++ b/src/demuxers/demux_fli.c @@ -22,7 +22,7 @@ * avoid while programming a FLI decoder, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_fli.c,v 1.4 2002/07/14 22:27:25 miguelfreitas Exp $ + * $Id: demux_fli.c,v 1.5 2002/07/15 00:54:12 tmmm Exp $ */ #ifdef HAVE_CONFIG_H @@ -308,6 +308,10 @@ static int demux_fli_start (demux_plugin_t *this_gen, xine_log (this->xine, XINE_LOG_FORMAT, _("demux_fli: %d frames, %dx%d\n"), this->frame_count, this->width, this->height); + xine_log (this->xine, XINE_LOG_FORMAT, + _("demux_fli: running time: %d min, %d sec\n"), + this->frame_count * this->frame_pts_inc / 90000 / 60, + this->frame_count * this->frame_pts_inc / 90000 % 60); /* send start buffers */ xine_demux_control_start(this->xine); @@ -339,7 +343,7 @@ static int demux_fli_start (demux_plugin_t *this_gen, pthread_mutex_unlock(&this->mutex); - return this->status; + return DEMUX_OK; } static int demux_fli_seek (demux_plugin_t *this_gen, |