[cvs] / xvidcore / src / xvid.c Repository:
ViewVC logotype

Diff of /xvidcore/src/xvid.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.77.2.4, Mon Dec 1 16:35:47 2008 UTC revision 1.79, Sun Nov 30 16:36:44 2008 UTC
# Line 28  Line 28 
28  #include <string.h>  #include <string.h>
29  #include <time.h>  #include <time.h>
30    
 #if !defined(_WIN32)  
   #include <unistd.h>  
 #endif  
   
31  #include "xvid.h"  #include "xvid.h"
32  #include "decoder.h"  #include "decoder.h"
33  #include "encoder.h"  #include "encoder.h"
# Line 665  Line 661 
661                  return XVID_ERR_VERSION;                  return XVID_ERR_VERSION;
662    
663          info->actual_version = XVID_VERSION;          info->actual_version = XVID_VERSION;
664          info->build = "xvid-1.2.1";          info->build = "xvid-1.3.0-dev";
665          info->cpu_flags = detect_cpu_flags();          info->cpu_flags = detect_cpu_flags();
666          info->num_threads = 0;          info->num_threads = 0;
667    
# Line 679  Line 675 
675    
676  #else  #else
677    
678      #include <unistd.h>
679    info->num_threads = sysconf(_SC_NPROCESSORS_CONF);    info->num_threads = sysconf(_SC_NPROCESSORS_CONF);
680    
681  #endif  #endif

Legend:
Removed from v.1.77.2.4  
changed lines
  Added in v.1.79

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4