[svn] / trunk / xvidcore / vfw / src / codec.c Repository:
ViewVC logotype

Diff of /trunk/xvidcore/vfw/src/codec.c

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

revision 1945, Thu Jan 27 13:13:16 2011 UTC revision 1952, Wed Feb 16 19:04:39 2011 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., 675 Mass Ave, Cambridge, MA 02139, USA.   *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21   *   *
22   * $Id: codec.c,v 1.32 2011-01-27 13:13:06 Isibaar Exp $   * $Id: codec.c,v 1.33 2011-02-16 18:59:45 Isibaar Exp $
23   *   *
24   *************************************************************************/   *************************************************************************/
25    
# Line 608  Line 608 
608      if ((profiles[codec->config.profile].flags & PROFILE_EXTRA))      if ((profiles[codec->config.profile].flags & PROFILE_EXTRA))
609        create.global |= XVID_GLOBAL_DIVX5_USERDATA;        create.global |= XVID_GLOBAL_DIVX5_USERDATA;
610    
611            if ((profiles[codec->config.profile].flags & PROFILE_EXTRA) ||
612                    (profiles[codec->config.profile].flags & PROFILE_XVID)) {
613              create.frame_drop_ratio = 0;
614            } else {
615          create.frame_drop_ratio = quality_preset->frame_drop_ratio;          create.frame_drop_ratio = quality_preset->frame_drop_ratio;
616            }
617    
618          switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))          switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))
619          {          {
# Line 926  Line 931 
931                  return ICERR_ERROR;                  return ICERR_ERROR;
932          }          }
933    
934          if (inhdr->biCompression != FOURCC_XVID && inhdr->biCompression != FOURCC_DIVX && inhdr->biCompression != FOURCC_DX50 && (in_csp = get_colorspace(inhdr)) != XVID_CSP_YV12)          if (inhdr->biCompression != FOURCC_XVID && inhdr->biCompression != FOURCC_DIVX && inhdr->biCompression != FOURCC_DX50 && inhdr->biCompression != FOURCC_MP4V &&
935                    inhdr->biCompression != FOURCC_xvid && inhdr->biCompression != FOURCC_divx && inhdr->biCompression != FOURCC_dx50 && inhdr->biCompression != FOURCC_mp4v &&
936                    (in_csp = get_colorspace(inhdr)) != XVID_CSP_YV12)
937          {          {
938                  return ICERR_BADFORMAT;                  return ICERR_BADFORMAT;
939          }          }
# Line 1084  Line 1091 
1091          /* --- yv12 --- */          /* --- yv12 --- */
1092          if (icd->lpbiInput->biCompression != FOURCC_XVID &&          if (icd->lpbiInput->biCompression != FOURCC_XVID &&
1093                   icd->lpbiInput->biCompression != FOURCC_DIVX &&                   icd->lpbiInput->biCompression != FOURCC_DIVX &&
1094                   icd->lpbiInput->biCompression != FOURCC_DX50)                   icd->lpbiInput->biCompression != FOURCC_DX50 &&
1095                     icd->lpbiInput->biCompression != FOURCC_MP4V &&
1096                     icd->lpbiInput->biCompression != FOURCC_xvid &&
1097                     icd->lpbiInput->biCompression != FOURCC_divx &&
1098                     icd->lpbiInput->biCompression != FOURCC_dx50 &&
1099                     icd->lpbiInput->biCompression != FOURCC_mp4v)
1100          {          {
1101                  xvid_gbl_convert_t convert;                  xvid_gbl_convert_t convert;
1102    

Legend:
Removed from v.1945  
changed lines
  Added in v.1952

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