Changeset 1084:e6e543dd8242 in mediastreamer2

Timestamp:

Feb 21, 2011 11:47:58 PM (2 years ago)

Author:

laurent

Branch:

default

Message:

bug fix : dealloc msv4m2

File:

• src/msv4m2.m (modified) (3 diffs)

src/msv4m2.m

@@ -84 +84 @@
 
 -(void) dealloc {
-    [super dealloc];
-        
         [self stop];
         
-        //if(session)
-        //      [session release];
-        
-        //if(device)
-        //      [device release];
+        if(session)
+                [session release];
+        
+        if(device)
+                [device release];
                 
-        //if(input)
-        //      [input release];
-        
-        //if(output)
-        //      [output release];
+        if(input)
+                [input release];
+        
+        if(output)
+                [output release];
         
         flushq(&rq,0);
         ms_mutex_destroy(&mutex);
+
+        [super dealloc];
 }
 
@@ -263 +263 @@
 static void v4m_uninit(MSFilter *f){
         printf("v4m_uninit\n");
-        NSAutoreleasePool* myPool = [[NSAutoreleasePool alloc] init];
+        //NSAutoreleasePool* myPool = [[NSAutoreleasePool alloc] init];
         v4mState *s=(v4mState*)f->data;
         v4m_stop(f,NULL);
@@ -270 +270 @@
         [s->webcam release];
         ms_free(s);
-        [myPool release];
+        //[myPool release];
 }