diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-17 12:21:01 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-17 12:21:01 +0000 |
| commit | 2bb6eba21d1843d67127be031aab7576dbe4c200 (patch) | |
| tree | 58da36fa398f13d1c6916e14af466f28ea735ce4 /libavcodec/h263.c | |
| parent | 9ce6c1387988bf3cdb631f3844e99a0c9bea43f2 (diff) | |
| download | ffmpeg-2bb6eba21d1843d67127be031aab7576dbe4c200.tar.gz | |
remove ff_get_fourcc() and use AV_RL32() instead
Originally committed as revision 16654 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h263.c')
| -rw-r--r-- | libavcodec/h263.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 41b4f11eff..5f151bfd71 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -114,7 +114,7 @@ max run: 29/41 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 @@ int h263_decode_picture_header(MpegEncContext *s) 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 @@ static int decode_vol_header(MpegEncContext *s, GetBitContext *gb){ 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 @@ int ff_mpeg4_decode_picture_header(MpegEncContext * s, GetBitContext *gb) /* 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; |