From 8b8750e0612f0bc30fafbb767f7931158868971d Mon Sep 17 00:00:00 2001 From: Derek Buitenhuis Date: Sat, 4 Aug 2012 15:40:35 -0400 Subject: cosmetics: Fix a few switched periods and linebreaks Based on a patch by Piotr Bandurski. Signed-off-by: Derek Buitenhuis --- libavfilter/vf_libopencv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavfilter') diff --git a/libavfilter/vf_libopencv.c b/libavfilter/vf_libopencv.c index e60caf2bc3..ea6ebe1b16 100644 --- a/libavfilter/vf_libopencv.c +++ b/libavfilter/vf_libopencv.c @@ -106,7 +106,7 @@ static av_cold int smooth_init(AVFilterContext *ctx, const char *args) else if (!strcmp(type_str, "gaussian" )) smooth->type = CV_GAUSSIAN; else if (!strcmp(type_str, "bilateral" )) smooth->type = CV_BILATERAL; else { - av_log(ctx, AV_LOG_ERROR, "Smoothing type '%s' unknown\n.", type_str); + av_log(ctx, AV_LOG_ERROR, "Smoothing type '%s' unknown.\n", type_str); return AVERROR(EINVAL); } @@ -220,7 +220,7 @@ static int parse_iplconvkernel(IplConvKernel **kernel, char *buf, void *log_ctx) return ret; } else { av_log(log_ctx, AV_LOG_ERROR, - "Shape unspecified or type '%s' unknown\n.", shape_str); + "Shape unspecified or type '%s' unknown.\n", shape_str); return AVERROR(EINVAL); } -- cgit v1.2.3 From 800750417ffea64cde827de08e31e6523205f8d1 Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Sat, 4 Aug 2012 15:24:15 +0200 Subject: lavfi: properly signal out-of-memory error in ff_filter_samples Found with a clang-scan report on http://fate.libav.org/csa/ --- libavfilter/audio.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libavfilter') diff --git a/libavfilter/audio.c b/libavfilter/audio.c index d518b247a3..bd718c611d 100644 --- a/libavfilter/audio.c +++ b/libavfilter/audio.c @@ -172,6 +172,10 @@ int ff_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref) buf_out = ff_default_get_audio_buffer(link, dst->min_perms, samplesref->audio->nb_samples); + if (!buf_out) { + avfilter_unref_buffer(samplesref); + return AVERROR(ENOMEM); + } buf_out->pts = samplesref->pts; buf_out->audio->sample_rate = samplesref->audio->sample_rate; -- cgit v1.2.3