diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-30 01:23:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-30 01:29:11 +0200 |
| commit | 5a35cef4b102ba99c31f83db8092b4d36383b044 (patch) | |
| tree | 13bf45700873c38b3824eb917118d4bda450453d /libavdevice | |
| parent | adba9c63525b8971fc6ccda47e643dca05c3ee9d (diff) | |
| parent | 371266daa3df35c424203fff0ce2e6de0e33a29d (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ARM: enable UAL syntax in asm.S
v4l2: don't leak video standard string on error.
swscale: Remove disabled code.
avfilter: Surround function only used in debug mode by appropriate #ifdef.
vf_crop: Replace #ifdef DEBUG + av_log() by av_dlog().
build: remove BUILD_ROOT variable
vp8: use av_clip_uintp2() where possible
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/v4l2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 9adf367fcb..9bbd01df9e 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -501,7 +501,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", @@ -670,6 +669,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; } |