Mercurial > mplayer.hg
comparison libmpdemux/mp_taglists.c @ 35600:f15a80d56c7e
Support FFmpeg Silicon Graphics Motion Video Compressor 1 and 2.
author | cehoyos |
---|---|
date | Tue, 18 Dec 2012 00:53:45 +0000 |
parents | 415e59838dc9 |
children | 4bcf4d38c8ad |
comparison
equal
deleted
inserted
replaced
35599:415e59838dc9 | 35600:f15a80d56c7e |
---|---|
151 { CODEC_ID_JV, MKTAG('F', 'F', 'J', 'V')}, | 151 { CODEC_ID_JV, MKTAG('F', 'F', 'J', 'V')}, |
152 { CODEC_ID_MAD, MKTAG('M', 'A', 'D', 'k')}, | 152 { CODEC_ID_MAD, MKTAG('M', 'A', 'D', 'k')}, |
153 { CODEC_ID_MDEC, MKTAG('M', 'D', 'E', 'C')}, | 153 { CODEC_ID_MDEC, MKTAG('M', 'D', 'E', 'C')}, |
154 { CODEC_ID_MMVIDEO, MKTAG('M', 'M', 'V', ' ')}, | 154 { CODEC_ID_MMVIDEO, MKTAG('M', 'M', 'V', ' ')}, |
155 { CODEC_ID_MOTIONPIXELS, MKTAG('M', 'V', 'I', '1')}, | 155 { CODEC_ID_MOTIONPIXELS, MKTAG('M', 'V', 'I', '1')}, |
156 #if LIBAVUTIL_VERSION_MICRO >= 100 | |
157 { AV_CODEC_ID_MVC1, MKTAG('m', 'v', 'c', '1')}, | |
158 { AV_CODEC_ID_MVC2, MKTAG('m', 'v', 'c', '2')}, | |
159 #endif | |
156 { CODEC_ID_MXPEG, MKTAG('M', 'X', 'P', 'G')}, | 160 { CODEC_ID_MXPEG, MKTAG('M', 'X', 'P', 'G')}, |
157 { CODEC_ID_NUV, MKTAG('N', 'U', 'V', '1')}, | 161 { CODEC_ID_NUV, MKTAG('N', 'U', 'V', '1')}, |
158 { CODEC_ID_RL2, MKTAG('R', 'L', '2', 'V')}, | 162 { CODEC_ID_RL2, MKTAG('R', 'L', '2', 'V')}, |
159 { CODEC_ID_ROQ, MKTAG('R', 'o', 'Q', 'V')}, | 163 { CODEC_ID_ROQ, MKTAG('R', 'o', 'Q', 'V')}, |
160 { CODEC_ID_RV10, MKTAG('R', 'V', '1', '0')}, | 164 { CODEC_ID_RV10, MKTAG('R', 'V', '1', '0')}, |