Revision 0726b2d1 libav/jpeg.c

View differences:

libav/jpeg.c
1 1
/*
2 2
 * JPEG based formats
3
 * Copyright (c) 2000, 2001 Gerard Lantau.
3
 * Copyright (c) 2000, 2001 Fabrice Bellard.
4 4
 *
5
 * This program is free software; you can redistribute it and/or modify
6
 * it under the terms of the GNU General Public License as published by
7
 * the Free Software Foundation; either version 2 of the License, or
8
 * (at your option) any later version.
5
 * This library is free software; you can redistribute it and/or
6
 * modify it under the terms of the GNU Lesser General Public
7
 * License as published by the Free Software Foundation; either
8
 * version 2 of the License, or (at your option) any later version.
9 9
 *
10
 * This program is distributed in the hope that it will be useful,
10
 * This library is distributed in the hope that it will be useful,
11 11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
 * GNU General Public License for more details.
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
13
 * Lesser General Public License for more details.
14 14
 *
15
 * You should have received a copy of the GNU General Public License
16
 * along with this program; if not, write to the Free Software
17
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
15
 * You should have received a copy of the GNU Lesser General Public
16
 * License along with this library; if not, write to the Free Software
17
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18 18
 */
19 19
#include "avformat.h"
20 20

  
......
91 91
    "singlejpeg",
92 92
    "single JPEG image",
93 93
    "image/jpeg",
94
    "jpg,jpeg",
94
    NULL, /* note: no extension to favorize jpeg multiple images match */
95 95
    0,
96 96
    CODEC_ID_NONE,
97 97
    CODEC_ID_MJPEG,
......
145 145

  
146 146
static int jpeg_write_trailer(AVFormatContext *s1)
147 147
{
148
    JpegContext *s = s1->priv_data;
149
    av_free(s);
150 148
    return 0;
151 149
}
152 150

  
......
228 226

  
229 227
static int jpeg_read_close(AVFormatContext *s1)
230 228
{
231
    JpegContext *s = s1->priv_data;
232
    av_free(s);
233 229
    return 0;
234 230
}
235 231

  

Also available in: Unified diff