comparison riff.c @ 3132:2014993e4399 libavformat

consistent use of MKTAG() in the codec_bmp_tags table
author aurel
date Sun, 09 Mar 2008 23:43:55 +0000
parents a5238e8e81c3
children 752431b6ce46
comparison
equal deleted inserted replaced
3131:a5238e8e81c3 3132:2014993e4399
46 { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') }, 46 { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') },
47 { CODEC_ID_MPEG4, MKTAG('D', 'X', '5', '0') }, 47 { CODEC_ID_MPEG4, MKTAG('D', 'X', '5', '0') },
48 { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') }, 48 { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') },
49 { CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') }, 49 { CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') },
50 { CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') }, 50 { CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') },
51 { CODEC_ID_MPEG4, MKTAG(0x04, 0, 0, 0) }, /* some broken avi use this */ 51 { CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 0 ) }, /* some broken avi use this */
52 52
53 /* added based on MPlayer */ 53 /* added based on MPlayer */
54 { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', '1') }, 54 { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', '1') },
55 { CODEC_ID_MPEG4, MKTAG('B', 'L', 'Z', '0') }, 55 { CODEC_ID_MPEG4, MKTAG('B', 'L', 'Z', '0') },
56 { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, 56 { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') },
93 { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '2') }, 93 { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '2') },
94 { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', '2') }, 94 { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', '2') },
95 { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'P', 'E', 'G') }, 95 { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'P', 'E', 'G') },
96 { CODEC_ID_MPEG1VIDEO, MKTAG('P', 'I', 'M', '1') }, 96 { CODEC_ID_MPEG1VIDEO, MKTAG('P', 'I', 'M', '1') },
97 { CODEC_ID_MPEG1VIDEO, MKTAG('V', 'C', 'R', '2') }, 97 { CODEC_ID_MPEG1VIDEO, MKTAG('V', 'C', 'R', '2') },
98 { CODEC_ID_MPEG1VIDEO, 0x10000001 }, 98 { CODEC_ID_MPEG1VIDEO, MKTAG( 1 , 0 , 0 , 16) },
99 { CODEC_ID_MPEG2VIDEO, 0x10000002 }, 99 { CODEC_ID_MPEG2VIDEO, MKTAG( 2 , 0 , 0 , 16) },
100 { CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') }, 100 { CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') },
101 { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') }, 101 { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') },
102 { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') }, 102 { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
103 { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') }, 103 { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') },
104 { CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') }, 104 { CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') },
109 { CODEC_ID_MJPEG, MKTAG('I', 'J', 'P', 'G') }, 109 { CODEC_ID_MJPEG, MKTAG('I', 'J', 'P', 'G') },
110 { CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, 110 { CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') },
111 { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') }, 111 { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') },
112 { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') }, 112 { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') },
113 { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') }, 113 { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') },
114 { CODEC_ID_RAWVIDEO, 0 }, 114 { CODEC_ID_RAWVIDEO, MKTAG( 0 , 0 , 0 , 0 ) },
115 { CODEC_ID_RAWVIDEO, MKTAG('I', '4', '2', '0') }, 115 { CODEC_ID_RAWVIDEO, MKTAG('I', '4', '2', '0') },
116 { CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'Y', '2') }, 116 { CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'Y', '2') },
117 { CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '2', '2') }, 117 { CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '2', '2') },
118 { CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', '1', '2') }, 118 { CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', '1', '2') },
119 { CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'V', 'Y') }, 119 { CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'V', 'Y') },
134 { CODEC_ID_ASV2, MKTAG('A', 'S', 'V', '2') }, 134 { CODEC_ID_ASV2, MKTAG('A', 'S', 'V', '2') },
135 { CODEC_ID_VCR1, MKTAG('V', 'C', 'R', '1') }, 135 { CODEC_ID_VCR1, MKTAG('V', 'C', 'R', '1') },
136 { CODEC_ID_FFV1, MKTAG('F', 'F', 'V', '1') }, 136 { CODEC_ID_FFV1, MKTAG('F', 'F', 'V', '1') },
137 { CODEC_ID_XAN_WC4, MKTAG('X', 'x', 'a', 'n') }, 137 { CODEC_ID_XAN_WC4, MKTAG('X', 'x', 'a', 'n') },
138 { CODEC_ID_MSRLE, MKTAG('m', 'r', 'l', 'e') }, 138 { CODEC_ID_MSRLE, MKTAG('m', 'r', 'l', 'e') },
139 { CODEC_ID_MSRLE, MKTAG(0x1, 0x0, 0x0, 0x0) }, 139 { CODEC_ID_MSRLE, MKTAG( 1 , 0 , 0 , 0 ) },
140 { CODEC_ID_MSVIDEO1, MKTAG('M', 'S', 'V', 'C') }, 140 { CODEC_ID_MSVIDEO1, MKTAG('M', 'S', 'V', 'C') },
141 { CODEC_ID_MSVIDEO1, MKTAG('m', 's', 'v', 'c') }, 141 { CODEC_ID_MSVIDEO1, MKTAG('m', 's', 'v', 'c') },
142 { CODEC_ID_MSVIDEO1, MKTAG('C', 'R', 'A', 'M') }, 142 { CODEC_ID_MSVIDEO1, MKTAG('C', 'R', 'A', 'M') },
143 { CODEC_ID_MSVIDEO1, MKTAG('c', 'r', 'a', 'm') }, 143 { CODEC_ID_MSVIDEO1, MKTAG('c', 'r', 'a', 'm') },
144 { CODEC_ID_MSVIDEO1, MKTAG('W', 'H', 'A', 'M') }, 144 { CODEC_ID_MSVIDEO1, MKTAG('W', 'H', 'A', 'M') },