summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2005-05-03 01:31:12 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2005-05-03 01:31:12 +0000
commiteebec83e7a20572d6c389c30ac4702efeeaeb27d (patch)
treeb8e46047eeb565d964425430d46b591b900d611a
parent4f94897f180ea9aeef5457cc81fc5e1f42058c94 (diff)
downloadxine-lib-eebec83e7a20572d6c389c30ac4702efeeaeb27d.tar.gz
xine-lib-eebec83e7a20572d6c389c30ac4702efeeaeb27d.tar.bz2
**BUGFIX**
Clip goom fps value to >= 1 [bug #1193783] CVS patchset: 7514 CVS date: 2005/05/03 01:31:12
-rw-r--r--ChangeLog1
-rw-r--r--src/post/goom/xine_goom.c8
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 58a0ec0cb..fc7d84fbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ xine-lib (1.1)
xine-lib (1.0.2)
* fixed xxmc / xvmc mocomp / IDCT rendering errors caused by the big update.
* support --enable-fpic with recent versions of gcc
+ * clip goom fps value to >= 1 [bug #1193783]
xine-lib (1.0.1)
* Big XvMC quality / correctness / cpu-usage fix. [bug #1114517]
diff --git a/src/post/goom/xine_goom.c b/src/post/goom/xine_goom.c
index 42d017bb3..02cf1f372 100644
--- a/src/post/goom/xine_goom.c
+++ b/src/post/goom/xine_goom.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_goom.c,v 1.56 2004/12/12 22:01:26 mroi Exp $
+ * $Id: xine_goom.c,v 1.57 2005/05/03 01:31:13 dsalt Exp $
*
* GOOM post plugin.
*
@@ -145,9 +145,13 @@ static void fps_changed_cb(void *data, xine_cfg_entry_t *cfg) {
if(class->ip) {
post_plugin_goom_t *this = class->ip;
+
+ if (cfg->num_value < 1)
+ cfg->num_value = 1;
+
this->fps = cfg->num_value;
- if(this->sample_rate && this->fps)
+ if(this->sample_rate)
this->samples_per_frame = this->sample_rate / this->fps;
}
}