*** netpbm-10.34/converter/ppm/ppmtompeg/combine.c	Thu Apr 13 03:09:20 2006
--- netpbm-10.34.new/converter/ppm/ppmtompeg/combine.c	Wed Oct  4 15:21:30 2006
***************
*** 108,118 ****
  
          for (nAttempts = 0, ifP = NULL;
               nAttempts < READ_ATTEMPTS && !ifP;
               ++nAttempts) {
  
-             FILE * ifP;
              ifP = fopen(fileName, "rb");
              if (ifP == NULL) {
                  pm_message("ERROR:  Couldn't read file '%s'.  retry %u", 
                             fileName, nAttempts);
                  sleep(1);
--- 108,117 ----
*** netpbm-10.34/converter/ppm/ppmtompeg/mpeg.c	Fri Apr 14 03:05:02 2006
--- netpbm-10.34.new/converter/ppm/ppmtompeg/mpeg.c	Wed Oct  4 15:16:11 2006
***************
*** 1148,1158 ****
                  &numI, &numP, &numB, &timeMask, &frameCountsUnknown);
  
      if (showBitRatePerFrame)
          OpenBitRateFile();  /* May modify showBitRatePerFrame */
  
!     if (context == CONTEXT_WHOLESTREAM)
          bbP = Bitio_New(ofP);
      else
          bbP = NULL;
  
      initTCTime(firstFrame);
--- 1148,1158 ----
                  &numI, &numP, &numB, &timeMask, &frameCountsUnknown);
  
      if (showBitRatePerFrame)
          OpenBitRateFile();  /* May modify showBitRatePerFrame */
  
!     if (context == CONTEXT_WHOLESTREAM || context == CONTEXT_GOP)
          bbP = Bitio_New(ofP);
      else
          bbP = NULL;
  
      initTCTime(firstFrame);