Mercurial > libavformat.hg
annotate matroska.c @ 4240:dff232a64d7c libavformat
Treat disposition==0 as undefined and don't write the default flag
author | conrad |
---|---|
date | Sat, 17 Jan 2009 04:31:14 +0000 |
parents | 722d6aed4828 |
children | 5b9eddbee9c4 |
rev | line source |
---|---|
380
9416dc106e06
matroska demuxer by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)
michael
parents:
diff
changeset
|
1 /* |
2142
3aa1f0f698de
split some common code from the mkv demuxer that will be useful to the muxer
aurel
parents:
2023
diff
changeset
|
2 * Matroska common data |
380
9416dc106e06
matroska demuxer by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)
michael
parents:
diff
changeset
|
3 * Copyright (c) 2003-2004 The ffmpeg Project |
9416dc106e06
matroska demuxer by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)
michael
parents:
diff
changeset
|
4 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1332
diff
changeset
|
5 * This file is part of FFmpeg. |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1332
diff
changeset
|
6 * |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1332
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
380
9416dc106e06
matroska demuxer by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)
michael
parents:
diff
changeset
|
8 * modify it under the terms of the GNU Lesser General Public |
9416dc106e06
matroska demuxer by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)
michael
parents:
diff
changeset
|
9 * License as published by the Free Software Foundation; either |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1332
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
380
9416dc106e06
matroska demuxer by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)
michael
parents:
diff
changeset
|
11 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1332
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
380
9416dc106e06
matroska demuxer by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)
michael
parents:
diff
changeset
|
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
9416dc106e06
matroska demuxer by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)
michael
parents:
diff
changeset
|
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
9416dc106e06
matroska demuxer by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)
michael
parents:
diff
changeset
|
15 * Lesser General Public License for more details. |
9416dc106e06
matroska demuxer by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)
michael
parents:
diff
changeset
|
16 * |
9416dc106e06
matroska demuxer by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)
michael
parents:
diff
changeset
|
17 * You should have received a copy of the GNU Lesser General Public |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1332
diff
changeset
|
18 * License along with FFmpeg; if not, write to the Free Software |
896
edbe5c3717f9
Update licensing information: The FSF changed postal address.
diego
parents:
887
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
380
9416dc106e06
matroska demuxer by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)
michael
parents:
diff
changeset
|
20 */ |
9416dc106e06
matroska demuxer by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)
michael
parents:
diff
changeset
|
21 |
2142
3aa1f0f698de
split some common code from the mkv demuxer that will be useful to the muxer
aurel
parents:
2023
diff
changeset
|
22 #include "matroska.h" |
380
9416dc106e06
matroska demuxer by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)
michael
parents:
diff
changeset
|
23 |
2793
d5842afe8539
Make ff_mkv_codec_tags array const, it is never written.
reimar
parents:
2533
diff
changeset
|
24 const CodecTags ff_mkv_codec_tags[]={ |
4086 | 25 {"A_AAC" , CODEC_ID_AAC}, |
26 {"A_AC3" , CODEC_ID_AC3}, | |
27 {"A_DTS" , CODEC_ID_DTS}, | |
28 {"A_EAC3" , CODEC_ID_EAC3}, | |
29 {"A_FLAC" , CODEC_ID_FLAC}, | |
2279
3c02e08e7b5a
use the most appropriate codec id for A_MPEG/L1 and L2
aurel
parents:
2278
diff
changeset
|
30 {"A_MPEG/L2" , CODEC_ID_MP2}, |
3c02e08e7b5a
use the most appropriate codec id for A_MPEG/L1 and L2
aurel
parents:
2278
diff
changeset
|
31 {"A_MPEG/L1" , CODEC_ID_MP2}, |
4086 | 32 {"A_MPEG/L3" , CODEC_ID_MP3}, |
33 {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F32LE}, | |
34 {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F64LE}, | |
3746 | 35 {"A_PCM/INT/BIG" , CODEC_ID_PCM_S16BE}, |
36 {"A_PCM/INT/BIG" , CODEC_ID_PCM_S24BE}, | |
37 {"A_PCM/INT/BIG" , CODEC_ID_PCM_S32BE}, | |
38 {"A_PCM/INT/LIT" , CODEC_ID_PCM_S16LE}, | |
39 {"A_PCM/INT/LIT" , CODEC_ID_PCM_S24LE}, | |
40 {"A_PCM/INT/LIT" , CODEC_ID_PCM_S32LE}, | |
41 {"A_PCM/INT/LIT" , CODEC_ID_PCM_U8}, | |
4086 | 42 {"A_QUICKTIME/QDM2" , CODEC_ID_QDM2}, |
2144 | 43 {"A_REAL/14_4" , CODEC_ID_RA_144}, |
44 {"A_REAL/28_8" , CODEC_ID_RA_288}, | |
45 {"A_REAL/ATRC" , CODEC_ID_ATRAC3}, | |
46 {"A_REAL/COOK" , CODEC_ID_COOK}, | |
47 // {"A_REAL/SIPR" , CODEC_ID_SIPRO}, | |
4086 | 48 {"A_TTA1" , CODEC_ID_TTA}, |
49 {"A_VORBIS" , CODEC_ID_VORBIS}, | |
50 {"A_WAVPACK4" , CODEC_ID_WAVPACK}, | |
2244 | 51 |
2278
5e5e2df75af3
reorder matroska codec tags so that the encoder picks up the appropriate tag
aurel
parents:
2264
diff
changeset
|
52 {"S_TEXT/UTF8" , CODEC_ID_TEXT}, |
2244 | 53 {"S_TEXT/ASCII" , CODEC_ID_TEXT}, |
2873
3fad6c2f343a
export raw SSA tracks with their own codec ID (patch by Evgeniy Stepanov)
aurel
parents:
2793
diff
changeset
|
54 {"S_TEXT/ASS" , CODEC_ID_SSA}, |
3fad6c2f343a
export raw SSA tracks with their own codec ID (patch by Evgeniy Stepanov)
aurel
parents:
2793
diff
changeset
|
55 {"S_TEXT/SSA" , CODEC_ID_SSA}, |
3fad6c2f343a
export raw SSA tracks with their own codec ID (patch by Evgeniy Stepanov)
aurel
parents:
2793
diff
changeset
|
56 {"S_ASS" , CODEC_ID_SSA}, |
3fad6c2f343a
export raw SSA tracks with their own codec ID (patch by Evgeniy Stepanov)
aurel
parents:
2793
diff
changeset
|
57 {"S_SSA" , CODEC_ID_SSA}, |
2244 | 58 {"S_VOBSUB" , CODEC_ID_DVD_SUBTITLE}, |
59 | |
4086 | 60 {"V_DIRAC" , CODEC_ID_DIRAC}, |
61 {"V_MJPEG" , CODEC_ID_MJPEG}, | |
62 {"V_MPEG1" , CODEC_ID_MPEG1VIDEO}, | |
63 {"V_MPEG2" , CODEC_ID_MPEG2VIDEO}, | |
64 {"V_MPEG4/ISO/ASP" , CODEC_ID_MPEG4}, | |
65 {"V_MPEG4/ISO/AP" , CODEC_ID_MPEG4}, | |
66 {"V_MPEG4/ISO/SP" , CODEC_ID_MPEG4}, | |
67 {"V_MPEG4/ISO/AVC" , CODEC_ID_H264}, | |
68 {"V_MPEG4/MS/V3" , CODEC_ID_MSMPEG4V3}, | |
69 {"V_REAL/RV10" , CODEC_ID_RV10}, | |
70 {"V_REAL/RV20" , CODEC_ID_RV20}, | |
71 {"V_REAL/RV30" , CODEC_ID_RV30}, | |
72 {"V_REAL/RV40" , CODEC_ID_RV40}, | |
73 {"V_SNOW" , CODEC_ID_SNOW}, | |
74 {"V_THEORA" , CODEC_ID_THEORA}, | |
75 {"V_UNCOMPRESSED" , CODEC_ID_RAWVIDEO}, | |
76 | |
2905
616fb87724b5
Make ff_mkv_codec_tags lie entirely in .rodata section.
aurel
parents:
2873
diff
changeset
|
77 {"" , CODEC_ID_NONE} |
1024 | 78 }; |
2973 | 79 |
80 const CodecMime ff_mkv_mime_tags[] = { | |
81 {"text/plain" , CODEC_ID_TEXT}, | |
82 {"image/gif" , CODEC_ID_GIF}, | |
83 {"image/jpeg" , CODEC_ID_MJPEG}, | |
84 {"image/png" , CODEC_ID_PNG}, | |
85 {"image/tiff" , CODEC_ID_TIFF}, | |
86 {"application/x-truetype-font", CODEC_ID_TTF}, | |
87 {"application/x-font" , CODEC_ID_TTF}, | |
88 | |
89 {"" , CODEC_ID_NONE} | |
90 }; |