[vlc-commits] date_Decrement: change assert so it doesn't to funky stuff

Ilkka Ollakka git at videolan.org
Sat Jan 4 14:13:41 CET 2014


vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Wed Dec 11 09:02:49 2013 +0200| [4e6c9e082db20a723154dc79d604092fc120c146] | committer: Ilkka Ollakka

date_Decrement: change assert so it doesn't to funky stuff

If we do date_Set and right after that date_Decrement that assert
seemed to behave differently in 64bit and 32bit architectures.

Ref #9022, #10101

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4e6c9e082db20a723154dc79d604092fc120c146
---

 src/misc/mtime.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/misc/mtime.c b/src/misc/mtime.c
index 4bc2db2..62409ed 100644
--- a/src/misc/mtime.c
+++ b/src/misc/mtime.c
@@ -217,7 +217,7 @@ mtime_t date_Decrement( date_t *p_date, uint32_t i_nb_samples )
     if( p_date->i_remainder < i_rem_adjust )
     {
         /* This is Bresenham algorithm. */
-        assert( p_date->i_remainder > -p_date->i_divider_num);
+        assert( p_date->i_remainder < p_date->i_divider_num);
         p_date->date -= 1;
         p_date->i_remainder += p_date->i_divider_num;
     }



More information about the vlc-commits mailing list