[svn] / branches / dev-api-4 / xvidcore / src / xvid.c Repository:
ViewVC logotype

Diff of /branches/dev-api-4/xvidcore/src/xvid.c

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

revision 1054, Mon Jun 9 13:55:56 2003 UTC revision 1107, Sat Aug 2 15:08:48 2003 UTC
# Line 19  Line 19 
19   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
20   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
21   *   *
22   * $Id: xvid.c,v 1.45.2.6 2003-06-09 13:51:17 edgomez Exp $   * $Id: xvid.c,v 1.45.2.12 2003-08-02 15:08:30 edgomez Exp $
23   *   *
24   ****************************************************************************/   ****************************************************************************/
25    
# Line 163  Line 163 
163  {  {
164          unsigned int cpu_flags;          unsigned int cpu_flags;
165    
166          if (XVID_MAJOR(init->version) != 1) /* v1.x.x */          if (XVID_VERSION_MAJOR(init->version) != 1) /* v1.x.x */
167                  return XVID_ERR_VERSION;                  return XVID_ERR_VERSION;
168    
169          cpu_flags = (init->cpu_flags & XVID_CPU_FORCE) ? init->cpu_flags : detect_cpu_flags();          cpu_flags = (init->cpu_flags & XVID_CPU_FORCE) ? init->cpu_flags : detect_cpu_flags();
# Line 288  Line 288 
288    
289  #if defined(ARCH_IS_IA32)  #if defined(ARCH_IS_IA32)
290    
291          if ((cpu_flags & XVID_CPU_ASM))          if ((cpu_flags & XVID_CPU_ASM)) {
         {  
292                  vfilter_31 = xvid_VFilter_31_x86;                  vfilter_31 = xvid_VFilter_31_x86;
293                  hfilter_31 = xvid_HFilter_31_x86;                  hfilter_31 = xvid_HFilter_31_x86;
294          }          }
# Line 488  Line 487 
487                  dev16    = dev16_sse2;                  dev16    = dev16_sse2;
488  #endif  #endif
489                  /* Forward and Inverse DCT */                  /* Forward and Inverse DCT */
490    #if 0 /* Both function are known to be unprecise, better keep them deactivated */
491                  idct  = idct_sse2;                  idct  = idct_sse2;
492                  fdct = fdct_sse2;                  fdct = fdct_sse2;
493    #endif
494          }          }
495  #endif  #endif
496    
# Line 516  Line 517 
517            transfer_8to16sub2 = transfer_8to16sub2_ia64;            transfer_8to16sub2 = transfer_8to16sub2_ia64;
518            transfer_16to8add = transfer_16to8add_ia64;            transfer_16to8add = transfer_16to8add_ia64;
519            transfer8x8_copy = transfer8x8_copy_ia64;            transfer8x8_copy = transfer8x8_copy_ia64;
           DPRINTF(DPRINTF_DEBUG, "Using IA-64 assembler routines.");  
520          }          }
521  #endif  #endif
522    
# Line 549  Line 549 
549  static int  static int
550  xvid_gbl_info(xvid_gbl_info_t * info)  xvid_gbl_info(xvid_gbl_info_t * info)
551  {  {
552          if (XVID_MAJOR(info->version) != 1) /* v1.x.x */          if (XVID_VERSION_MAJOR(info->version) != 1) /* v1.x.x */
553                  return XVID_ERR_VERSION;                  return XVID_ERR_VERSION;
554    
555          info->actual_version = XVID_VERSION;          info->actual_version = XVID_VERSION;
# Line 575  Line 575 
575          int height2;          int height2;
576          IMAGE img;          IMAGE img;
577    
578          if (XVID_MAJOR(convert->version) != 1)   /* v1.x.x */          if (XVID_VERSION_MAJOR(convert->version) != 1)   /* v1.x.x */
579                return XVID_ERR_VERSION;                return XVID_ERR_VERSION;
580    
581  #if 0  #if 0
Legend:
Removed from v.1054  
changed lines
  Added in v.1107
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4