Mercurial > libavcodec.hg

comparison cavs.c @ 4917:6c457e692336 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid a clash between two definitions of SEQ_START_CODE
author aurel
date Sat, 05 May 2007 18:31:34 +0000
parents a96d905dcbaa
children f77445d40161
comparison
equal deleted inserted replaced
4916:13ef168891b0 4917:6c457e692336
1350 buf_ptr = ff_find_start_code(buf_ptr,buf_end, &stc); 1350 buf_ptr = ff_find_start_code(buf_ptr,buf_end, &stc);
1351 if(stc & 0xFFFFFE00) 1351 if(stc & 0xFFFFFE00)
1352 return FFMAX(0, buf_ptr - buf - s->parse_context.last_index); 1352 return FFMAX(0, buf_ptr - buf - s->parse_context.last_index);
1353 input_size = (buf_end - buf_ptr)*8; 1353 input_size = (buf_end - buf_ptr)*8;
1354 switch(stc) { 1354 switch(stc) {
1355 case SEQ_START_CODE: 1355 case CAVS_START_CODE:
1356 init_get_bits(&s->gb, buf_ptr, input_size); 1356 init_get_bits(&s->gb, buf_ptr, input_size);
1357 decode_seq_header(h); 1357 decode_seq_header(h);
1358 break; 1358 break;
1359 case PIC_I_START_CODE: 1359 case PIC_I_START_CODE:
1360 if(!h->got_keyframe) { 1360 if(!h->got_keyframe) {