Mercurial > libavcodec.hg
comparison h261dec.c @ 6481:493dc59d469a libavcodec
add FF_ prefix to all (frame)_TYPE usage
author | aurel |
---|---|
date | Sun, 09 Mar 2008 23:31:02 +0000 |
parents | 7100aeea042e |
children | 48759bfbd073 |
comparison
equal
deleted
inserted
replaced
6480:6f01a499e785 | 6481:493dc59d469a |
---|---|
491 /* PEI */ | 491 /* PEI */ |
492 while (get_bits1(&s->gb) != 0){ | 492 while (get_bits1(&s->gb) != 0){ |
493 skip_bits(&s->gb, 8); | 493 skip_bits(&s->gb, 8); |
494 } | 494 } |
495 | 495 |
496 // h261 has no I-FRAMES, but if we pass I_TYPE for the first frame, the codec crashes if it does | 496 // h261 has no I-FRAMES, but if we pass FF_I_TYPE for the first frame, the codec crashes if it does |
497 // not contain all I-blocks (e.g. when a packet is lost) | 497 // not contain all I-blocks (e.g. when a packet is lost) |
498 s->pict_type = P_TYPE; | 498 s->pict_type = FF_P_TYPE; |
499 | 499 |
500 h->gob_number = 0; | 500 h->gob_number = 0; |
501 return 0; | 501 return 0; |
502 } | 502 } |
503 | 503 |
591 goto retry; | 591 goto retry; |
592 } | 592 } |
593 | 593 |
594 // for hurry_up==5 | 594 // for hurry_up==5 |
595 s->current_picture.pict_type= s->pict_type; | 595 s->current_picture.pict_type= s->pict_type; |
596 s->current_picture.key_frame= s->pict_type == I_TYPE; | 596 s->current_picture.key_frame= s->pict_type == FF_I_TYPE; |
597 | 597 |
598 /* skip everything if we are in a hurry>=5 */ | 598 /* skip everything if we are in a hurry>=5 */ |
599 if(avctx->hurry_up>=5) return get_consumed_bytes(s, buf_size); | 599 if(avctx->hurry_up>=5) return get_consumed_bytes(s, buf_size); |
600 if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==B_TYPE) | 600 if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==FF_B_TYPE) |
601 ||(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=I_TYPE) | 601 ||(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=FF_I_TYPE) |
602 || avctx->skip_frame >= AVDISCARD_ALL) | 602 || avctx->skip_frame >= AVDISCARD_ALL) |
603 return get_consumed_bytes(s, buf_size); | 603 return get_consumed_bytes(s, buf_size); |
604 | 604 |
605 if(MPV_frame_start(s, avctx) < 0) | 605 if(MPV_frame_start(s, avctx) < 0) |
606 return -1; | 606 return -1; |