Commit 17269bdf authored by Fabrice Bellard's avatar Fabrice Bellard

fixed double free - fixed probe function

Originally committed as revision 592 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 0726b2d1
/* /*
* Flash Compatible Streaming Format * Flash Compatible Streaming Format
* Copyright (c) 2000 Gerard Lantau. * Copyright (c) 2000 Fabrice Bellard.
* *
* This program is free software; you can redistribute it and/or modify * This library is free software; you can redistribute it and/or
* it under the terms of the GNU General Public License as published by * modify it under the terms of the GNU Lesser General Public
* the Free Software Foundation; either version 2 of the License, or * License as published by the Free Software Foundation; either
* (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* GNU General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU Lesser General Public
* along with this program; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "avformat.h" #include "avformat.h"
...@@ -414,7 +414,6 @@ static int swf_write_trailer(AVFormatContext *s) ...@@ -414,7 +414,6 @@ static int swf_write_trailer(AVFormatContext *s)
url_fseek(pb, swf->duration_pos, SEEK_SET); url_fseek(pb, swf->duration_pos, SEEK_SET);
put_le16(pb, video_enc->frame_number); put_le16(pb, video_enc->frame_number);
} }
av_free(swf);
return 0; return 0;
} }
...@@ -445,7 +444,7 @@ static int swf_probe(AVProbeData *p) ...@@ -445,7 +444,7 @@ static int swf_probe(AVProbeData *p)
if (p->buf_size <= 16) if (p->buf_size <= 16)
return 0; return 0;
if (p->buf[0] == 'F' && p->buf[1] == 'W' && if (p->buf[0] == 'F' && p->buf[1] == 'W' &&
p->buf[2] == 'S' && p->buf[3] == '\0') p->buf[2] == 'S')
return AVPROBE_SCORE_MAX; return AVPROBE_SCORE_MAX;
else else
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment