aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2011-02-03 11:31:41 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-02-06 20:31:44 +0100
commitbffad70c6658f722cbed4b1f06cca89c9de12cf3 (patch)
treea21d46b4c63c076161f005f68bdad6e8f54ee785
parentb9004bd50c2fa5d4c0ef71ec09c9e70ec83f2e87 (diff)
downloadffmpeg-bffad70c6658f722cbed4b1f06cca89c9de12cf3.tar.gz
Remove forgotten if (p) av_free(p) forms
Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 290849e2a4e76484f1a34506782e8dbfe7bbe406)
-rw-r--r--libavfilter/defaults.c2
-rw-r--r--libavformat/avidec.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c
index 98339b6f30..9f245c306f 100644
--- a/libavfilter/defaults.c
+++ b/libavfilter/defaults.c
@@ -126,7 +126,7 @@ AVFilterBufferRef *avfilter_default_get_audio_buffer(AVFilterLink *link, int per
return ref;
fail:
- if (ref && ref->audio)
+ if (ref)
av_free(ref->audio);
av_free(ref);
av_free(samples);
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index d8d4726ae9..27a9d1fbc3 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1354,8 +1354,7 @@ static int avi_read_close(AVFormatContext *s)
}
}
- if (avi->dv_demux)
- av_free(avi->dv_demux);
+ av_free(avi->dv_demux);
return 0;
}