Sophie

Sophie

distrib > Mandriva > 2007.1 > x86_64 > by-pkgid > df48baf119202ff37f0b2825f164730d > files > 2

stopmotion-0.5.3-3mdv2007.1.src.rpm

diff -aupr stopmotion-0.5.5/src/technical/libng/plugins/drv0-v4l2.c stopmotion-0.5.6/src/technical/libng/plugins/drv0-v4l2.c
--- stopmotion-0.5.5/src/technical/libng/plugins/drv0-v4l2.c	2007-01-06 06:13:18.000000000 -0800
+++ stopmotion-0.5.6/src/technical/libng/plugins/drv0-v4l2.c	2007-02-04 13:48:08.000000000 -0800
@@ -508,13 +508,6 @@ v4l2_close(void *handle)
 	close(h->fd);
 
 	if (NULL != h->attr) {
-		int i;
-		for (i = 0; i < h->nattr; ++i) {
-			if (NULL != h->attr[i].choices) {
-				free(h->attr[i].choices);
-				h->attr[i].choices = NULL;
-			}
-		}
 		free(h->attr);
 		h->attr = NULL;
 	}
diff -aupr stopmotion-0.5.5/src/technical/libng/plugins/drv1-v4l.c stopmotion-0.5.6/src/technical/libng/plugins/drv1-v4l.c
--- stopmotion-0.5.5/src/technical/libng/plugins/drv1-v4l.c	2007-01-06 06:13:18.000000000 -0800
+++ stopmotion-0.5.6/src/technical/libng/plugins/drv1-v4l.c	2007-02-04 13:48:08.000000000 -0800
@@ -468,18 +468,7 @@ v4l_close(void *handle)
     
     close(h->fd);
 
-	if (NULL != h->attr) {
-		int i;
-		for (i = 0; i < h->nattr; ++i) {
-			if (NULL != h->attr[i].choices) {
-				free(h->attr[i].choices);
-				h->attr[i].choices = NULL;
-			}
-		}
-		free(h->attr);
-		h->attr = NULL;
-	}
-	
+	if (NULL != h->attr)     { free(h->attr);     h->attr     = NULL; }
 	if (NULL != h->channels) { free(h->channels); h->channels = NULL; }
 	if (NULL != h->buf_v4l)  { free(h->buf_v4l);  h->buf_v4l  = NULL; }
 	if (NULL != h->buf_me)   { free(h->buf_me);   h->buf_me   = NULL; }