[x264-devel] commit: Fix stack alignment in sliced threads (Jason Garrett-Glaser )

[git at videolan.org]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Wed Mar 17 15:53:43 2010 -0700| [6314e08698b55e7d04d7a51521046ff3d1d7e791] | committer: Jason Garrett-Glaser 

Fix stack alignment in sliced threads
Could cause crashes when called from non-GCC-compiled applications.

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=6314e08698b55e7d04d7a51521046ff3d1d7e791
---

 encoder/encoder.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/encoder/encoder.c b/encoder/encoder.c
index c5ee306..9f45e6a 100644
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -2100,7 +2100,7 @@ static int x264_threaded_slices_write( x264_t *h )
         t->sh.i_last_mb  =   t->i_threadslice_end * h->sps->i_mb_width - 1;
     }
 
-    x264_analyse_weight_frame( h, h->sps->i_mb_height*16 + 16 );
+    x264_stack_align( x264_analyse_weight_frame, h, h->sps->i_mb_height*16 + 16 );
 
     x264_threads_distribute_ratecontrol( h );
 
@@ -2121,7 +2121,7 @@ static int x264_threaded_slices_write( x264_t *h )
 
     /* deblocking and hpel filtering */
     for( i = 0; i <= h->sps->i_mb_height; i++ )
-        x264_fdec_filter_row( h, i );
+        x264_stack_align( x264_fdec_filter_row, h, i );
 
     x264_threads_merge_ratecontrol( h );