comparison vp3.c @ 6350:8e63d869a904 libavcodec

typo fix: inited --> initialized
author diego
date Wed, 13 Feb 2008 09:26:10 +0000
parents aed237dd11d8
children 931ca319f2fe
comparison
equal deleted inserted replaced
6349:aed237dd11d8 6350:8e63d869a904
271 271
272 /* this is a list of indices into the all_fragments array indicating 272 /* this is a list of indices into the all_fragments array indicating
273 * which of the fragments are coded */ 273 * which of the fragments are coded */
274 int *coded_fragment_list; 274 int *coded_fragment_list;
275 int coded_fragment_list_index; 275 int coded_fragment_list_index;
276 int pixel_addresses_inited; 276 int pixel_addresses_initialized;
277 277
278 VLC dc_vlc[16]; 278 VLC dc_vlc[16];
279 VLC ac_vlc_1[16]; 279 VLC ac_vlc_1[16];
280 VLC ac_vlc_2[16]; 280 VLC ac_vlc_2[16];
281 VLC ac_vlc_3[16]; 281 VLC ac_vlc_3[16];
2007 s->fragment_start[2]); 2007 s->fragment_start[2]);
2008 2008
2009 s->all_fragments = av_malloc(s->fragment_count * sizeof(Vp3Fragment)); 2009 s->all_fragments = av_malloc(s->fragment_count * sizeof(Vp3Fragment));
2010 s->coeffs = av_malloc(s->fragment_count * sizeof(Coeff) * 65); 2010 s->coeffs = av_malloc(s->fragment_count * sizeof(Coeff) * 65);
2011 s->coded_fragment_list = av_malloc(s->fragment_count * sizeof(int)); 2011 s->coded_fragment_list = av_malloc(s->fragment_count * sizeof(int));
2012 s->pixel_addresses_inited = 0; 2012 s->pixel_addresses_initialized = 0;
2013 2013
2014 if (!s->theora_tables) 2014 if (!s->theora_tables)
2015 { 2015 {
2016 for (i = 0; i < 64; i++) { 2016 for (i = 0; i < 64; i++) {
2017 s->coded_dc_scale_factor[i] = vp31_dc_scale_factor[i]; 2017 s->coded_dc_scale_factor[i] = vp31_dc_scale_factor[i];
2201 2201
2202 /* golden frame is also the current frame */ 2202 /* golden frame is also the current frame */
2203 s->current_frame= s->golden_frame; 2203 s->current_frame= s->golden_frame;
2204 2204
2205 /* time to figure out pixel addresses? */ 2205 /* time to figure out pixel addresses? */
2206 if (!s->pixel_addresses_inited) 2206 if (!s->pixel_addresses_initialized)
2207 { 2207 {
2208 if (!s->flipped_image) 2208 if (!s->flipped_image)
2209 vp3_calculate_pixel_addresses(s); 2209 vp3_calculate_pixel_addresses(s);
2210 else 2210 else
2211 theora_calculate_pixel_addresses(s); 2211 theora_calculate_pixel_addresses(s);
2212 s->pixel_addresses_inited = 1; 2212 s->pixel_addresses_initialized = 1;
2213 } 2213 }
2214 } else { 2214 } else {
2215 /* allocate a new current frame */ 2215 /* allocate a new current frame */
2216 s->current_frame.reference = 3; 2216 s->current_frame.reference = 3;
2217 if (!s->pixel_addresses_inited) { 2217 if (!s->pixel_addresses_initialized) {
2218 av_log(s->avctx, AV_LOG_ERROR, "vp3: first frame not a keyframe\n"); 2218 av_log(s->avctx, AV_LOG_ERROR, "vp3: first frame not a keyframe\n");
2219 return -1; 2219 return -1;
2220 } 2220 }
2221 if(avctx->get_buffer(avctx, &s->current_frame) < 0) { 2221 if(avctx->get_buffer(avctx, &s->current_frame) < 0) {
2222 av_log(s->avctx, AV_LOG_ERROR, "vp3: get_buffer() failed\n"); 2222 av_log(s->avctx, AV_LOG_ERROR, "vp3: get_buffer() failed\n");