Sometimes x264 is crashing on single or first pass with multithreading.

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index 86d0f8864ab74a2381474948a2ce568721d25916..226ef6493a4acb851dcc0210e7fffc7aeeb3c254 100644 (file)
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.c
@@ -1350,12 +1350,12 @@ static void *consumer_thread( void *arg )
        }
 #endif
 
-       // XXX ugly hack to prevent x264 from crashing on second pass of multi-threaded encoding
+       // XXX ugly hack to prevent x264 from crashing on multi-threaded encoding
        int pass = mlt_properties_get_int( properties, "pass" );
        int thread_count = mlt_properties_get_int( properties, "threads" );
        if ( thread_count == 0 && getenv( "MLT_AVFORMAT_THREADS" ) )
                thread_count = atoi( getenv( "MLT_AVFORMAT_THREADS" ) );
-       int multithreaded_x264 = ( video_codec_id == CODEC_ID_H264 && pass == 2 && thread_count > 1 );
+       int multithreaded_x264 = ( video_codec_id == CODEC_ID_H264 && thread_count > 1 );
        
        // close each codec
        if ( video_st && !multithreaded_x264 )