[FFmpeg-cvslog] commit: Remove useless free, fix warning: (Baptiste Coudurier )

git at videolan.org git
Sun Jan 16 15:03:16 CET 2011


ffmpeg | branch: master | Baptiste Coudurier <baptiste.coudurier at gmail.com> | Sun Jan 16 02:47:25 2011 +0000| [ecea47a6ed9e9250474e1ef26120ff5dc9e71e8e] | committer: Baptiste Coudurier 

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ecea47a6ed9e9250474e1ef26120ff5dc9e71e8e
---

 libavfilter/defaults.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c
index c541bb1..6aa1020 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;




More information about the ffmpeg-cvslog mailing list