v4l2: don't leak video standard string on error.
authorAnton Khirnov <anton@khirnov.net>
Fri, 27 May 2011 07:32:17 +0000 (09:32 +0200)
committerAnton Khirnov <anton@khirnov.net>
Sun, 29 May 2011 13:10:35 +0000 (15:10 +0200)
libavdevice/v4l2.c

index e0186f8..80b6400 100644 (file)
@@ -511,7 +511,6 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap)
             return AVERROR(EIO);
         }
     }
-    av_freep(&s->standard);
 
     if (ap->time_base.num && ap->time_base.den) {
         av_log(s1, AV_LOG_DEBUG, "Setting time per frame to %d/%d\n",
@@ -681,6 +680,7 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
 out:
     av_freep(&s->video_size);
     av_freep(&s->pixel_format);
+    av_freep(&s->standard);
     return res;
 }