summaryrefslogtreecommitdiff
path: root/libavdevice
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-05-27 09:32:17 +0200
committerAnton Khirnov <anton@khirnov.net>2011-05-29 15:10:35 +0200
commit7a70e01b267b499d92fda68724d311c94cd76b26 (patch)
tree5d02f4d14e00b4c51056ec86775b133f2ff44b78 /libavdevice
parent06b5facd4b8cb19da352cec71b2edf2f0343ee35 (diff)
v4l2: don't leak video standard string on error.
Diffstat (limited to 'libavdevice')
-rw-r--r--libavdevice/v4l2.c2
1 files changed, 1 insertions, 1 deletions
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;
}