Mercurial > libavformat.hg
annotate voc.c @ 2043:3446000701c4 libavformat
Fix reading PTSs and DTSs in libavformat, by reverting r8465.
Such commit introduced some regressions (see the "Possible bug in reading
PTS/DTS" and "[BUG] no video transcoding" threads on ffmpeg-devel).
author | lucabe |
---|---|
date | Thu, 26 Apr 2007 10:49:48 +0000 |
parents | 2a85c82b8538 |
children | 06083249909c |
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 | |
19 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | |
20 */ | |
21 | |
22 #include "voc.h" | |
23 | |
24 const unsigned char voc_magic[21] = "Creative Voice File\x1A"; | |
25 | |
1677
2a85c82b8538
add codec_id <-> codec_tag tables to AVIn/OutputFormat
michael
parents:
1536
diff
changeset
|
26 const AVCodecTag 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}, | |
35 {0, 0}, | |
36 }; |