[svn] / trunk / xvidcore / examples / xvid_encraw.c Repository:
ViewVC logotype

Diff of /trunk/xvidcore/examples/xvid_encraw.c

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

revision 1947, Thu Feb 3 15:01:14 2011 UTC revision 2070, Fri Feb 7 16:00:50 2014 UTC
# Line 22  Line 22 
22   *  along with this program; if not, write to the Free Software   *  along with this program; if not, write to the Free Software
23   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
24   *   *
25   * $Id: xvid_encraw.c,v 1.49 2011-02-03 15:01:14 Isibaar Exp $   * $Id$
26   *   *
27   ****************************************************************************/   ****************************************************************************/
28    
# Line 1063  Line 1063 
1063                          totalenctime = MAX(totalenctime, enc_data[k].totalenctime);                          totalenctime = MAX(totalenctime, enc_data[k].totalenctime);
1064    
1065                          for (i=0; i < 3; i++) totalPSNR[i] += enc_data[k].totalPSNR[i];                          for (i=0; i < 3; i++) totalPSNR[i] += enc_data[k].totalPSNR[i];
1066                          for (i=0; i < 8; i++) {                          for (i=0; i < 7; i++) {
1067                                  int l;                                  int l;
1068                                  framestats[i].count += enc_data[k].framestats[i].count;                                  framestats[i].count += enc_data[k].framestats[i].count;
1069                                  framestats[i].size += enc_data[k].framestats[i].size;                                  framestats[i].size += enc_data[k].framestats[i].size;
# Line 1830  Line 1830 
1830  #ifdef XVID_AVI_OUTPUT  #ifdef XVID_AVI_OUTPUT
1831          fprintf(stderr, " -avi string: save an AVI file for the complete sequence\n");          fprintf(stderr, " -avi string: save an AVI file for the complete sequence\n");
1832  #endif  #endif
1833    #ifdef XVID_MKV_OUTPUT
1834          fprintf(stderr, " -mkv string: save a MKV file for the complete sequence\n");          fprintf(stderr, " -mkv string: save a MKV file for the complete sequence\n");
1835    #endif
1836          fprintf(stderr, "\n");          fprintf(stderr, "\n");
1837          fprintf(stderr, "BFrames options:\n");          fprintf(stderr, "BFrames options:\n");
1838          fprintf(stderr, " -max_bframes   integer: max bframes (2)\n");          fprintf(stderr, " -max_bframes   integer: max bframes (2)\n");
# Line 1936  Line 1938 
1938                  return (1);                  return (1);
1939    
1940          fscanf(handle, "%d %d %d", &xsize, &ysize, &depth);          fscanf(handle, "%d %d %d", &xsize, &ysize, &depth);
1941            fread(&dummy, 1, 1, handle);
1942          if ((xsize > 4096) || (ysize > 4096*3/2) || (depth != 255)) {          if ((xsize > 4096) || (ysize > 4096*3/2) || (depth != 255)) {
1943                  fprintf(stderr, "%d %d %d\n", xsize, ysize, depth);                  fprintf(stderr, "%d %d %d\n", xsize, ysize, depth);
1944                  return (2);                  return (2);
# Line 1953  Line 1956 
1956                           unsigned char *image)                           unsigned char *image)
1957  {  {
1958          int i;          int i;
         char dummy;  
1959    
1960          unsigned char *y = image;          unsigned char *y = image;
1961          unsigned char *u = image + XDIM * YDIM;          unsigned char *u = image + XDIM * YDIM;
# Line 1974  Line 1976 
1976                  v += XDIM / 2;                  v += XDIM / 2;
1977          }          }
1978    
         /*  I don't know why, but this seems needed */  
         fread(&dummy, 1, 1, handle);  
   
1979          return (0);          return (0);
1980  }  }
1981  #else  #else
Legend:
Removed from v.1947  
changed lines
  Added in v.2070
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4