[x264-devel] commit: Fix stack alignment with MB-tree (Jason Garrett-Glaser )

git at videolan.org git at videolan.org
Wed Jul 21 20:26:53 CEST 2010


x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Wed Jul 21 11:25:11 2010 -0700| [84a051f3f1598c4c48de4c84f8750a73d32edeeb] | committer: Jason Garrett-Glaser 

Fix stack alignment with MB-tree
Broke 2-pass with MB-tree when calling from compilers with broken stack alignment (e.g. MSVC).

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

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

diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index 93f2a30..ef197c4 100644
--- a/encoder/ratecontrol.c
+++ b/encoder/ratecontrol.c
@@ -386,7 +386,7 @@ int x264_macroblock_tree_read( x264_t *h, x264_frame_t *frame, float *quant_offs
         rc->qpbuf_pos--;
     }
     else
-        x264_adaptive_quant_frame( h, frame, quant_offsets );
+        x264_stack_align( x264_adaptive_quant_frame, h, frame, quant_offsets );
     return 0;
 fail:
     x264_log(h, X264_LOG_ERROR, "Incomplete MB-tree stats file.\n");



More information about the x264-devel mailing list