Don't like ads? PRO users don't see any ads ;-)
Public Pastes
Guest

Untitled

By: a guest on May 1st, 2012  |  syntax: None  |  size: 2.03 KB  |  hits: 16  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff --git a/input/ffms.c b/input/ffms.c
  2. index c086607..b2a253e 100644
  3. --- a/input/ffms.c
  4. +++ b/input/ffms.c
  5. @@ -75,12 +75,12 @@ static int open_file( char *psz_filename, hnd_t *p_handle, video_info_t *info, c
  6.      int seekmode = opt->seek ? FFMS_SEEK_NORMAL : FFMS_SEEK_LINEAR_NO_RW;
  7.  
  8.      FFMS_Index *idx = NULL;
  9. -    if( opt->index )
  10. +    if( opt->index_file )
  11.      {
  12.          struct stat index_s, input_s;
  13. -        if( !stat( opt->index, &index_s ) && !stat( psz_filename, &input_s ) &&
  14. +        if( !stat( opt->index_file, &index_s ) && !stat( psz_filename, &input_s ) &&
  15.              input_s.st_mtime < index_s.st_mtime )
  16. -            idx = FFMS_ReadIndex( opt->index, &e );
  17. +            idx = FFMS_ReadIndex( opt->index_file, &e );
  18.      }
  19.      if( !idx )
  20.      {
  21. @@ -91,7 +91,7 @@ static int open_file( char *psz_filename, hnd_t *p_handle, video_info_t *info, c
  22.              fprintf( stderr, "ffms [error]: could not create index\n" );
  23.              return -1;
  24.          }
  25. -        if( opt->index && FFMS_WriteIndex( opt->index, idx, &e ) )
  26. +        if( opt->index_file && FFMS_WriteIndex( opt->index_file, idx, &e ) )
  27.              fprintf( stderr, "ffms [warning]: could not write index file\n" );
  28.      }
  29.  
  30. diff --git a/input/input.h b/input/input.h
  31. index eb62fdd..f89b13b 100644
  32. --- a/input/input.h
  33. +++ b/input/input.h
  34. @@ -28,7 +28,7 @@
  35.  /* options that are used by only some demuxers */
  36.  typedef struct
  37.  {
  38. -    char *index;
  39. +    char *index_file;
  40.      char *resolution; /* resolution string parsed by raw yuv input */
  41.      char *timebase;
  42.      int seek;
  43. diff --git a/x264.c b/x264.c
  44. index b78b77a..cf50830 100644
  45. --- a/x264.c
  46. +++ b/x264.c
  47. @@ -1010,7 +1010,7 @@ static int Parse( int argc, char **argv, x264_param_t *param, cli_opt_t *opt )
  48.                  }
  49.                  break;
  50.              case OPT_INDEX:
  51. -                input_opt.index = optarg;
  52. +                input_opt.index_file = optarg;
  53.                  break;
  54.              case OPT_QPFILE:
  55.                  opt->qpfile = fopen( optarg, "rb" );
create a new version of this paste RAW Paste Data