Mercurial > libavcodec.hg
diff h263.c @ 8612:b20c590170cc libavcodec
remove ff_get_fourcc() and use AV_RL32() instead
author | aurel |
---|---|
date | Sat, 17 Jan 2009 12:21:01 +0000 |
parents | a637db9f59b1 |
children | d6bab465b82c |
line wrap: on
line diff
--- a/h263.c Sat Jan 17 11:13:33 2009 +0000 +++ b/h263.c Sat Jan 17 12:21:01 2009 +0000 @@ -114,7 +114,7 @@ static uint8_t static_rl_table_store[5][2][2*MAX_RUN + MAX_LEVEL + 3]; #if 0 //3IV1 is quite rare and it slows things down a tiny bit -#define IS_3IV1 s->codec_tag == ff_get_fourcc("3IV1") +#define IS_3IV1 s->codec_tag == AV_RL32("3IV1") #else #define IS_3IV1 0 #endif @@ -5223,7 +5223,7 @@ show_pict_info(s); } #if 1 - if (s->pict_type == FF_I_TYPE && s->codec_tag == ff_get_fourcc("ZYGO")){ + if (s->pict_type == FF_I_TYPE && s->codec_tag == AV_RL32("ZYGO")){ int i,j; for(i=0; i<85; i++) av_log(s->avctx, AV_LOG_DEBUG, "%d", get_bits1(&s->gb)); av_log(s->avctx, AV_LOG_DEBUG, "\n"); @@ -5548,7 +5548,7 @@ skip_bits1(gb); /* marker */ height = get_bits(gb, 13); skip_bits1(gb); /* marker */ - if(width && height && !(s->width && s->codec_tag == ff_get_fourcc("MP4S"))){ /* they should be non zero but who knows ... */ + if(width && height && !(s->width && s->codec_tag == AV_RL32("MP4S"))){ /* they should be non zero but who knows ... */ s->width = width; s->height = height; // printf("width/height: %d %d\n", width, height); @@ -6062,7 +6062,7 @@ /* search next start code */ align_get_bits(gb); - if(s->codec_tag == ff_get_fourcc("WV1F") && show_bits(gb, 24) == 0x575630){ + if(s->codec_tag == AV_RL32("WV1F") && show_bits(gb, 24) == 0x575630){ skip_bits(gb, 24); if(get_bits(gb, 8) == 0xF0) goto end;