Mercurial > libavformat.hg
annotate caf.c @ 6466:35bb7cdfe337 libavformat
In mov demuxer, do not override aspect ratio in tkhd by pasp like quicktime, fix issue #1539
| author | bcoudurier |
|---|---|
| date | Wed, 08 Sep 2010 20:18:14 +0000 |
| parents | c7b98381ec2d |
| children |
| rev | line source |
|---|---|
| 5206 | 1 /* |
| 2 * CAF common code | |
| 3 * Copyright (c) 2007 Justin Ruggles | |
| 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 Street, Fifth Floor, Boston, MA 02110-1301 USA | |
| 20 */ | |
| 21 | |
| 22 /** | |
|
5969
178de7695c6c
Remove explicit filename from Doxygen @file commands.
diego
parents:
5290
diff
changeset
|
23 * @file |
| 5206 | 24 * CAF common code |
| 25 */ | |
| 26 | |
| 27 #include "avformat.h" | |
| 6033 | 28 #include "internal.h" |
| 5206 | 29 #include "caf.h" |
| 30 | |
| 31 /** | |
| 32 * Known codec tags for CAF | |
| 33 */ | |
| 34 const AVCodecTag ff_codec_caf_tags[] = { | |
| 35 { CODEC_ID_AAC, MKBETAG('a','a','c',' ') }, | |
| 36 { CODEC_ID_AC3, MKBETAG('a','c','-','3') }, | |
| 37 { CODEC_ID_ALAC, MKBETAG('a','l','a','c') }, | |
| 38 /* FIXME: use DV demuxer, as done in MOV */ | |
| 39 /*{ CODEC_ID_DVAUDIO, MKBETAG('v','d','v','a') },*/ | |
| 40 /*{ CODEC_ID_DVAUDIO, MKBETAG('d','v','c','a') },*/ | |
| 41 { CODEC_ID_ADPCM_IMA_QT, MKBETAG('i','m','a','4') }, | |
| 42 { CODEC_ID_MACE3, MKBETAG('M','A','C','3') }, | |
| 43 { CODEC_ID_MACE6, MKBETAG('M','A','C','6') }, | |
| 44 { CODEC_ID_MP3, MKBETAG('.','m','p','3') }, | |
| 45 { CODEC_ID_MP2, MKBETAG('.','m','p','2') }, | |
| 46 { CODEC_ID_MP1, MKBETAG('.','m','p','1') }, | |
| 47 { CODEC_ID_PCM_ALAW, MKBETAG('a','l','a','w') }, | |
| 48 { CODEC_ID_PCM_MULAW, MKBETAG('u','l','a','w') }, | |
| 49 { CODEC_ID_QCELP, MKBETAG('Q','c','l','p') }, | |
| 50 { CODEC_ID_QDM2, MKBETAG('Q','D','M','2') }, | |
| 51 { CODEC_ID_QDM2, MKBETAG('Q','D','M','C') }, | |
| 52 /* currently unsupported codecs */ | |
| 53 /*{ AC-3 over S/PDIF MKBETAG('c','a','c','3') },*/ | |
| 54 /*{ MPEG4CELP MKBETAG('c','e','l','p') },*/ | |
| 55 /*{ MPEG4HVXC MKBETAG('h','v','x','c') },*/ | |
| 56 /*{ MPEG4TwinVQ MKBETAG('t','w','v','q') },*/ | |
|
5290
0d5653941bf9
Make AVCodecTag.id enum CodecID and use CODEC_ID_NONE instead of 0.
cehoyos
parents:
5206
diff
changeset
|
57 { CODEC_ID_NONE, 0 }, |
| 5206 | 58 }; |
