about summary refs log tree commit diff
path: root/converter
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2010-09-30 15:29:05 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2010-09-30 15:29:05 +0000
commit58de3a53d11a726750e3722701f3f67d711ae3c5 (patch)
treec6fa0a3d281bb5f03ffadad41e8bda7d9d6205c2 /converter
parent74e9f65431bf11763a11d1fca9f7f94cade9d99f (diff)
downloadnetpbm-mirror-58de3a53d11a726750e3722701f3f67d711ae3c5.tar.gz
netpbm-mirror-58de3a53d11a726750e3722701f3f67d711ae3c5.tar.xz
netpbm-mirror-58de3a53d11a726750e3722701f3f67d711ae3c5.zip
Release 10.47.20
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@1326 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter')
-rw-r--r--converter/ppm/ppmtompeg/param.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/converter/ppm/ppmtompeg/param.c b/converter/ppm/ppmtompeg/param.c
index bb5bc79a..a145d33c 100644
--- a/converter/ppm/ppmtompeg/param.c
+++ b/converter/ppm/ppmtompeg/param.c
@@ -283,8 +283,8 @@ GetFrameRate(const char * const p)
 
 
 static void
-mergeInputSource(struct inputSource * const baseSourceP,
-                 struct inputSource * const addedSourceP) {
+mergeInputSource(struct inputSource *       const baseSourceP,
+                 const struct inputSource * const addedSourceP) {
 
     unsigned int i;
 
@@ -294,12 +294,6 @@ mergeInputSource(struct inputSource * const baseSourceP,
     for (i = 0; i < addedSourceP->numInputFileEntries; ++i)
         baseSourceP->inputFileEntries[baseSourceP->numInputFileEntries++] =
             addedSourceP->inputFileEntries[i];
-
-    free(addedSourceP);
-    /* Note the space allocated for the *addedSourceP input file
-       entries themselves is still allocated, and used by 
-       *baseSourceP.
-    */
 }