Fix large file support, broken in r1302

diff --git a/common/common.h b/common/common.h
index ec61e14418aad9e30bbd5f2061d52d3269cf90a0..d7c51d5e61db55f5332a55dda495d81a248e94d8 100644 (file)
--- a/common/common.h
+++ b/common/common.h
@@ -80,6 +80,7 @@ do {\
 #include "dct.h"
 #include "cabac.h"
 #include "quant.h"
+#include "config.h"
 
 /****************************************************************************
  * General functions

diff --git a/encoder/encoder.c b/encoder/encoder.c
index 4db7d91ceffe4179bc3e8338662b1e93cb879f08..7cf6a963e6fb860b8c6b9a9a651d49e215a6a142 100644 (file)
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -67,7 +67,7 @@ static void x264_frame_dump( x264_t *h )
     if( !f )
         return;
     /* Write the frame in display order */
-    fseek( f, h->fdec->i_frame * h->param.i_height * h->param.i_width * 3/2, SEEK_SET );
+    fseek( f, (uint64_t)h->fdec->i_frame * h->param.i_height * h->param.i_width * 3/2, SEEK_SET );
     for( i = 0; i < h->fdec->i_plane; i++ )
         for( y = 0; y < h->param.i_height >> !!i; y++ )
             fwrite( &h->fdec->plane[i][y*h->fdec->i_stride[i]], 1, h->param.i_width >> !!i, f );

diff --git a/encoder/set.c b/encoder/set.c
index e087f83476191f266a6a54e2eb33cab3ccd1c91c..fd1a22ee1b7616f7e8a4c2f031a475b46c49c5e0 100644 (file)
--- a/encoder/set.c
+++ b/encoder/set.c
@@ -24,7 +24,6 @@
 #include <math.h>
 
 #include "common/common.h"
-#include "config.h"
 #include "set.h"
 
 #define bs_write_ue bs_write_ue_big

diff --git a/x264.c b/x264.c
index c1728f1b2cf66dfaeb55d7da58a3e49b8d98e0b4..d845a4788e06153afcc841dd5bb1e60acd77879a 100644 (file)
--- a/x264.c
+++ b/x264.c
@@ -32,7 +32,6 @@
 #include "common/cpu.h"
 #include "x264.h"
 #include "muxers.h"
-#include "config.h"
 
 #ifdef _WIN32
 #include <windows.h>