aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/defaults.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2011-01-16 02:47:25 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2011-01-16 02:47:25 +0000
commitecea47a6ed9e9250474e1ef26120ff5dc9e71e8e (patch)
treec1cdaa8b63a31f41a444a9bd7907aa13c5ce85ed /libavfilter/defaults.c
parent1b3e43e4fdbfe5b6ce10d19ed32a4f20fab76f5a (diff)
downloadffmpeg-ecea47a6ed9e9250474e1ef26120ff5dc9e71e8e.tar.gz
Remove useless free, fix warning:
libavfilter/defaults.c: In function 'avfilter_default_get_audio_buffer': libavfilter/defaults.c:129: warning: 'buf' is used uninitialized in this function Originally committed as revision 26382 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter/defaults.c')
-rw-r--r--libavfilter/defaults.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c
index c541bb1687..6aa1020e42 100644
--- a/libavfilter/defaults.c
+++ b/libavfilter/defaults.c
@@ -126,7 +126,6 @@ AVFilterBufferRef *avfilter_default_get_audio_buffer(AVFilterLink *link, int per
return ref;
fail:
- av_free(buf);
if (ref && ref->audio)
av_free(ref->audio);
av_free(ref);
@@ -210,6 +209,7 @@ int avfilter_default_config_output_link(AVFilterLink *link)
if (link->type == AVMEDIA_TYPE_VIDEO) {
link->w = link->src->inputs[0]->w;
link->h = link->src->inputs[0]->h;
+ link->sample_aspect_ratio = link->src->inputs[0]->sample_aspect_ratio;
link->time_base = link->src->inputs[0]->time_base;
} else if (link->type == AVMEDIA_TYPE_AUDIO) {
link->channel_layout = link->src->inputs[0]->channel_layout;