From 7a70e01b267b499d92fda68724d311c94cd76b26 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Fri, 27 May 2011 09:32:17 +0200
Subject: [PATCH] v4l2: don't leak video standard string on error.

---
 libavdevice/v4l2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index e0186f8031..80b640078d 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -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;
 }