Mercurial > libavcodec.hg

comparison msmpeg4.c @ 3359:87187ebe2c28 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename VC9 to VC1 as there is no such thing as VC9
author kostya
date Tue, 27 Jun 2006 02:55:54 +0000
parents 8d1b2cc2a75b
children de0ed6497a13
comparison
equal deleted inserted replaced
3358:4ae69b5b596b 3359:87187ebe2c28
73 #endif //CONFIG_ENCODERS 73 #endif //CONFIG_ENCODERS
74 static int msmpeg4v12_decode_mb(MpegEncContext *s, DCTELEM block[6][64]); 74 static int msmpeg4v12_decode_mb(MpegEncContext *s, DCTELEM block[6][64]);
75 static int msmpeg4v34_decode_mb(MpegEncContext *s, DCTELEM block[6][64]); 75 static int msmpeg4v34_decode_mb(MpegEncContext *s, DCTELEM block[6][64]);
76 static int wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]); 76 static int wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]);
77 77
78 /* vc9 externs */ 78 /* vc1 externs */
79 extern uint8_t wmv3_dc_scale_table[32]; 79 extern uint8_t wmv3_dc_scale_table[32];
80 80
81 #ifdef DEBUG 81 #ifdef DEBUG
82 int intra_count = 0; 82 int intra_count = 0;
83 int frame_count = 0; 83 int frame_count = 0;
175 case 4: 175 case 4:
176 case 5: 176 case 5:
177 s->y_dc_scale_table= wmv1_y_dc_scale_table; 177 s->y_dc_scale_table= wmv1_y_dc_scale_table;
178 s->c_dc_scale_table= wmv1_c_dc_scale_table; 178 s->c_dc_scale_table= wmv1_c_dc_scale_table;
179 break; 179 break;
180 #if defined(CONFIG_WMV3_DECODER)||defined(CONFIG_VC9_DECODER) 180 #if defined(CONFIG_WMV3_DECODER)||defined(CONFIG_VC1_DECODER)
181 case 6: 181 case 6:
182 s->y_dc_scale_table= wmv3_dc_scale_table; 182 s->y_dc_scale_table= wmv3_dc_scale_table;
183 s->c_dc_scale_table= wmv3_dc_scale_table; 183 s->c_dc_scale_table= wmv3_dc_scale_table;
184 break; 184 break;
185 #endif 185 #endif
1195 s->decode_mb= msmpeg4v34_decode_mb; 1195 s->decode_mb= msmpeg4v34_decode_mb;
1196 break; 1196 break;
1197 case 5: 1197 case 5:
1198 s->decode_mb= wmv2_decode_mb; 1198 s->decode_mb= wmv2_decode_mb;
1199 case 6: 1199 case 6:
1200 //FIXME + TODO VC9 decode mb 1200 //FIXME + TODO VC1 decode mb
1201 break; 1201 break;
1202 } 1202 }
1203 1203
1204 s->slice_height= s->mb_height; //to avoid 1/0 if the first frame isnt a keyframe 1204 s->slice_height= s->mb_height; //to avoid 1/0 if the first frame isnt a keyframe
1205 1205