From 703563da864bcc5898b0a7c3f2e95c380873914c Mon Sep 17 00:00:00 2001 From: giraffedata Date: Sun, 22 Oct 2006 17:38:34 +0000 Subject: Release 10.35.10 git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@105 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- converter/ppm/ppmtompeg/combine.c | 1 - converter/ppm/ppmtompeg/mpeg.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'converter/ppm/ppmtompeg') diff --git a/converter/ppm/ppmtompeg/combine.c b/converter/ppm/ppmtompeg/combine.c index 341bb5dc..52cc646d 100644 --- a/converter/ppm/ppmtompeg/combine.c +++ b/converter/ppm/ppmtompeg/combine.c @@ -110,7 +110,6 @@ appendSpecifiedGopFiles(struct inputSource * const inputSourceP, nAttempts < READ_ATTEMPTS && !ifP; ++nAttempts) { - FILE * ifP; ifP = fopen(fileName, "rb"); if (ifP == NULL) { pm_message("ERROR: Couldn't read file '%s'. retry %u", diff --git a/converter/ppm/ppmtompeg/mpeg.c b/converter/ppm/ppmtompeg/mpeg.c index a934ed09..fafbb97a 100644 --- a/converter/ppm/ppmtompeg/mpeg.c +++ b/converter/ppm/ppmtompeg/mpeg.c @@ -1150,7 +1150,7 @@ GenMPEGStream(struct inputSource * const inputSourceP, if (showBitRatePerFrame) OpenBitRateFile(); /* May modify showBitRatePerFrame */ - if (context == CONTEXT_WHOLESTREAM) + if (context == CONTEXT_WHOLESTREAM || context == CONTEXT_GOP) bbP = Bitio_New(ofP); else bbP = NULL; -- cgit 1.4.1