Mercurial > libavformat.hg
annotate voc.c @ 5854:3dc78fb78b2a libavformat
Fix erroneous behaviour when format probe hits end of file
If the format probe hits end of file, do not add the error code
to the buffer position. This is obviously wrong, and with a
small input file would cause a negative buffer overflow.
Fixes issue 1818.
author | mru |
---|---|
date | Tue, 16 Mar 2010 21:45:30 +0000 |
parents | 0d5653941bf9 |
children | c7b98381ec2d |
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" | |
23 | |
3764 | 24 const unsigned char ff_voc_magic[21] = "Creative Voice File\x1A"; |
1536 | 25 |
3764 | 26 const AVCodecTag ff_voc_codec_tags[] = { |
1536 | 27 {CODEC_ID_PCM_U8, 0x00}, |
28 {CODEC_ID_ADPCM_SBPRO_4, 0x01}, | |
29 {CODEC_ID_ADPCM_SBPRO_3, 0x02}, | |
30 {CODEC_ID_ADPCM_SBPRO_2, 0x03}, | |
31 {CODEC_ID_PCM_S16LE, 0x04}, | |
32 {CODEC_ID_PCM_ALAW, 0x06}, | |
33 {CODEC_ID_PCM_MULAW, 0x07}, | |
34 {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
|
35 {CODEC_ID_NONE, 0}, |
1536 | 36 }; |