Mercurial > libavformat.hg
annotate voc.c @ 6107:5ad38b8596b2 libavformat
Fix handling of errors in the http protocol
If http_connect fails, we've already stored the new connection handle in s->hd,
so clear it so http_close won't double-free it.
10l to me for not spotting it during review
author | mstorsjo |
---|---|
date | Tue, 08 Jun 2010 11:18:22 +0000 |
parents | c7b98381ec2d |
children |
rev | line source |
---|---|
1536 | 1 /* |
2 * Creative Voice File common data. | |
3 * Copyright (c) 2006 Aurelien Jacobs <aurel@gnuage.org> | |
4 * | |
5 * This file is part of FFmpeg. | |
6 * | |
7 * FFmpeg is free software; you can redistribute it and/or | |
8 * modify it under the terms of the GNU Lesser General Public | |
9 * License as published by the Free Software Foundation; either | |
10 * version 2.1 of the License, or (at your option) any later version. | |
11 * | |
12 * FFmpeg is distributed in the hope that it will be useful, | |
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Lesser General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU Lesser General Public | |
18 * License along with FFmpeg; if not, write to the Free Software | |
2217 | 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1536 | 20 */ |
21 | |
22 #include "voc.h" | |
6033 | 23 #include "internal.h" |
1536 | 24 |
3764 | 25 const unsigned char ff_voc_magic[21] = "Creative Voice File\x1A"; |
1536 | 26 |
3764 | 27 const AVCodecTag ff_voc_codec_tags[] = { |
1536 | 28 {CODEC_ID_PCM_U8, 0x00}, |
29 {CODEC_ID_ADPCM_SBPRO_4, 0x01}, | |
30 {CODEC_ID_ADPCM_SBPRO_3, 0x02}, | |
31 {CODEC_ID_ADPCM_SBPRO_2, 0x03}, | |
32 {CODEC_ID_PCM_S16LE, 0x04}, | |
33 {CODEC_ID_PCM_ALAW, 0x06}, | |
34 {CODEC_ID_PCM_MULAW, 0x07}, | |
35 {CODEC_ID_ADPCM_CT, 0x0200}, | |
5290
0d5653941bf9
Make AVCodecTag.id enum CodecID and use CODEC_ID_NONE instead of 0.
cehoyos
parents:
3764
diff
changeset
|
36 {CODEC_ID_NONE, 0}, |
1536 | 37 }; |