Revision 737dccfc

View differences:

libavformat/matroska.c
22 22
#include "matroska.h"
23 23

  
24 24
const CodecTags ff_mkv_codec_tags[]={
25
    {"V_UNCOMPRESSED"   , CODEC_ID_RAWVIDEO},
26
    {"V_DIRAC"          , CODEC_ID_DIRAC},
27
    {"V_MPEG4/ISO/ASP"  , CODEC_ID_MPEG4},
28
    {"V_MPEG4/ISO/SP"   , CODEC_ID_MPEG4},
29
    {"V_MPEG4/ISO/AP"   , CODEC_ID_MPEG4},
30
    {"V_MPEG4/ISO/AVC"  , CODEC_ID_H264},
31
    {"V_MPEG4/MS/V3"    , CODEC_ID_MSMPEG4V3},
32
    {"V_MPEG1"          , CODEC_ID_MPEG1VIDEO},
33
    {"V_MPEG2"          , CODEC_ID_MPEG2VIDEO},
34
    {"V_MJPEG"          , CODEC_ID_MJPEG},
35
    {"V_REAL/RV10"      , CODEC_ID_RV10},
36
    {"V_REAL/RV20"      , CODEC_ID_RV20},
37
    {"V_REAL/RV30"      , CODEC_ID_RV30},
38
    {"V_REAL/RV40"      , CODEC_ID_RV40},
39
    {"V_THEORA"         , CODEC_ID_THEORA},
40
    {"V_SNOW"           , CODEC_ID_SNOW},
41

  
42
    {"A_MPEG/L3"        , CODEC_ID_MP3},
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},
43 30
    {"A_MPEG/L2"        , CODEC_ID_MP2},
44 31
    {"A_MPEG/L1"        , CODEC_ID_MP2},
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},
45 35
    {"A_PCM/INT/BIG"    , CODEC_ID_PCM_S16BE},
46 36
    {"A_PCM/INT/BIG"    , CODEC_ID_PCM_S24BE},
47 37
    {"A_PCM/INT/BIG"    , CODEC_ID_PCM_S32BE},
......
49 39
    {"A_PCM/INT/LIT"    , CODEC_ID_PCM_S24LE},
50 40
    {"A_PCM/INT/LIT"    , CODEC_ID_PCM_S32LE},
51 41
    {"A_PCM/INT/LIT"    , CODEC_ID_PCM_U8},
52
    {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F32LE},
53
    {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F64LE},
54
    {"A_AC3"            , CODEC_ID_AC3},
55
    {"A_EAC3"           , CODEC_ID_EAC3},
56
    {"A_DTS"            , CODEC_ID_DTS},
57
    {"A_VORBIS"         , CODEC_ID_VORBIS},
58
    {"A_AAC"            , CODEC_ID_AAC},
59
    {"A_FLAC"           , CODEC_ID_FLAC},
60
    {"A_WAVPACK4"       , CODEC_ID_WAVPACK},
61
    {"A_TTA1"           , CODEC_ID_TTA},
42
    {"A_QUICKTIME/QDM2" , CODEC_ID_QDM2},
62 43
    {"A_REAL/14_4"      , CODEC_ID_RA_144},
63 44
    {"A_REAL/28_8"      , CODEC_ID_RA_288},
64 45
    {"A_REAL/ATRC"      , CODEC_ID_ATRAC3},
65 46
    {"A_REAL/COOK"      , CODEC_ID_COOK},
66 47
//    {"A_REAL/SIPR"      , CODEC_ID_SIPRO},
67
    {"A_QUICKTIME/QDM2" , CODEC_ID_QDM2},
48
    {"A_TTA1"           , CODEC_ID_TTA},
49
    {"A_VORBIS"         , CODEC_ID_VORBIS},
50
    {"A_WAVPACK4"       , CODEC_ID_WAVPACK},
68 51

  
69 52
    {"S_TEXT/UTF8"      , CODEC_ID_TEXT},
70 53
    {"S_TEXT/ASCII"     , CODEC_ID_TEXT},
......
74 57
    {"S_SSA"            , CODEC_ID_SSA},
75 58
    {"S_VOBSUB"         , CODEC_ID_DVD_SUBTITLE},
76 59

  
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

  
77 77
    {""                 , CODEC_ID_NONE}
78 78
};
79 79

  

Also available in: Unified diff