diff --git a/input/ffms.c b/input/ffms.c
index c086607..b2a253e 100644
--- a/input/ffms.c
+++ b/input/ffms.c
@@ -75,12 +75,12 @@ static int open_file( char *psz_filename, hnd_t *p_handle, video_info_t *info, c
     int seekmode = opt->seek ? FFMS_SEEK_NORMAL : FFMS_SEEK_LINEAR_NO_RW;

     FFMS_Index *idx = NULL;
-    if( opt->index )
+    if( opt->index_file )
     {
         struct stat index_s, input_s;
-        if( !stat( opt->index, &index_s ) && !stat( psz_filename, &input_s ) &&
+        if( !stat( opt->index_file, &index_s ) && !stat( psz_filename, &input_s ) &&
             input_s.st_mtime < index_s.st_mtime )
-            idx = FFMS_ReadIndex( opt->index, &e );
+            idx = FFMS_ReadIndex( opt->index_file, &e );
     }
     if( !idx )
     {
@@ -91,7 +91,7 @@ static int open_file( char *psz_filename, hnd_t *p_handle, video_info_t *info, c
             fprintf( stderr, "ffms [error]: could not create index\n" );
             return -1;
         }
-        if( opt->index && FFMS_WriteIndex( opt->index, idx, &e ) )
+        if( opt->index_file && FFMS_WriteIndex( opt->index_file, idx, &e ) )
             fprintf( stderr, "ffms [warning]: could not write index file\n" );
     }

diff --git a/input/input.h b/input/input.h
index eb62fdd..f89b13b 100644
--- a/input/input.h
+++ b/input/input.h
@@ -28,7 +28,7 @@
 /* options that are used by only some demuxers */
 typedef struct
 {
-    char *index;
+    char *index_file;
     char *resolution; /* resolution string parsed by raw yuv input */
     char *timebase;
     int seek;
diff --git a/x264.c b/x264.c
index b78b77a..cf50830 100644
--- a/x264.c
+++ b/x264.c
@@ -1010,7 +1010,7 @@ static int Parse( int argc, char **argv, x264_param_t *param, cli_opt_t *opt )
                 }
                 break;
             case OPT_INDEX:
-                input_opt.index = optarg;
+                input_opt.index_file = optarg;
                 break;
             case OPT_QPFILE:
                 opt->qpfile = fopen( optarg, "rb" );