aboutsummaryrefslogtreecommitdiffstats
path: root/libav
diff options
context:
space:
mode:
authorFabrice Bellard <fabrice@bellard.org>2002-05-25 22:33:18 +0000
committerFabrice Bellard <fabrice@bellard.org>2002-05-25 22:33:18 +0000
commit17269bdfcdb79679f6b92024d1228e876b799a63 (patch)
tree004d3b73b5fcbebb981b4786eab07c5184b044bd /libav
parent0726b2d1ea4343698ff603cc32b824f5bce952c5 (diff)
downloadffmpeg-17269bdfcdb79679f6b92024d1228e876b799a63.tar.gz
fixed double free - fixed probe function
Originally committed as revision 592 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libav')
-rw-r--r--libav/swf.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/libav/swf.c b/libav/swf.c
index 79ef4bba51..14f8707f96 100644
--- a/libav/swf.c
+++ b/libav/swf.c
@@ -1,20 +1,20 @@
/*
* 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "avformat.h"
@@ -414,7 +414,6 @@ static int swf_write_trailer(AVFormatContext *s)
url_fseek(pb, swf->duration_pos, SEEK_SET);
put_le16(pb, video_enc->frame_number);
}
- av_free(swf);
return 0;
}
@@ -445,7 +444,7 @@ static int swf_probe(AVProbeData *p)
if (p->buf_size <= 16)
return 0;
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;
else
return 0;