diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2006-10-22 17:37:29 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2006-10-22 17:37:29 +0000 |
| commit | 111180e9ec6772eb480179f96dbb581118670922 (patch) | |
| tree | 8886dfd17c06a5f4755a69b956f215bb34b51e13 /converter/ppm/ppmtompeg | |
| parent | 51efe0f517b40d324ee76389e55a2de408bafebd (diff) | |
| download | netpbm-mirror-111180e9ec6772eb480179f96dbb581118670922.tar.gz netpbm-mirror-111180e9ec6772eb480179f96dbb581118670922.tar.xz netpbm-mirror-111180e9ec6772eb480179f96dbb581118670922.zip | |
Release 10.36.05
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@104 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/ppm/ppmtompeg')
| -rw-r--r-- | converter/ppm/ppmtompeg/combine.c | 1 | ||||
| -rw-r--r-- | converter/ppm/ppmtompeg/mpeg.c | 2 |
2 files changed, 1 insertions, 2 deletions
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; |