[x264-devel] commit: Fix sliced-threads + interlaced (Jason Garrett-Glaser )

git at videolan.org git at videolan.org
Thu May 6 07:49:22 CEST 2010


x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Sun May  2 11:45:15 2010 -0700| [44f83cc129480d67c76b1b0e11c97870957ff2c2] | committer: Jason Garrett-Glaser 

Fix sliced-threads + interlaced
Broken in r1546.

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

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

diff --git a/encoder/encoder.c b/encoder/encoder.c
index e9819b3..7ad4295 100644
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -2103,7 +2103,11 @@ static int x264_threaded_slices_write( x264_t *h )
 
     /* Go back and fix up the hpel on the borders between slices. */
     for( int i = 1; i < h->param.i_threads; i++ )
+    {
         x264_fdec_filter_row( h->thread[i], h->thread[i]->i_threadslice_start + 1, 0 );
+        if( h->sh.b_mbaff )
+            x264_fdec_filter_row( h->thread[i], h->thread[i]->i_threadslice_start + 2, 0 );
+    }
 
     x264_threads_merge_ratecontrol( h );
 



More information about the x264-devel mailing list