about summary refs log tree commit diff
path: root/converter/ppm/ppmtompeg
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2010-09-18 20:18:39 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2010-09-18 20:18:39 +0000
commitc1504a8ffa4694779448393e5781cb182610c486 (patch)
tree69bb7cccc11e6031cc4ecc281d0c72d564ec45cc /converter/ppm/ppmtompeg
parent64085f3a76eb6db2c14e52ccb06301f6a5807b77 (diff)
downloadnetpbm-mirror-c1504a8ffa4694779448393e5781cb182610c486.tar.gz
netpbm-mirror-c1504a8ffa4694779448393e5781cb182610c486.tar.xz
netpbm-mirror-c1504a8ffa4694779448393e5781cb182610c486.zip
Release 10.35.77
git-svn-id: http://svn.code.sf.net/p/netpbm/code/super_stable@1287 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/ppm/ppmtompeg')
-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 5ea69ab6..69e38a6c 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.
-    */
 }