[FFmpeg-cvslog] v4l2: don't leak video standard string on error.
Anton Khirnov
git at videolan.org
Mon May 30 01:44:30 CEST 2011
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Fri May 27 09:32:17 2011 +0200| [7a70e01b267b499d92fda68724d311c94cd76b26] | committer: Anton Khirnov
v4l2: don't leak video standard string on error.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a70e01b267b499d92fda68724d311c94cd76b26
---
libavdevice/v4l2.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index e0186f8..80b6400 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;
}
More information about the ffmpeg-cvslog
mailing list