diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-04-28 01:40:44 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-05-02 16:41:41 +0200 |
| commit | ce5e49b0c2c11ec153834677fc5c903dd71d4e6e (patch) | |
| tree | d641bd887afa961820f6bc93727c9b0812b58aa1 /libavcodec/wmv2dec.c | |
| parent | 301183d9be4e426d472d4be8c84095c853cb8ac4 (diff) | |
| download | ffmpeg-ce5e49b0c2c11ec153834677fc5c903dd71d4e6e.tar.gz | |
replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*
Diffstat (limited to 'libavcodec/wmv2dec.c')
| -rw-r--r-- | libavcodec/wmv2dec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index 3214aae42b..78aee3dfdc 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -120,7 +120,7 @@ int ff_wmv2_decode_picture_header(MpegEncContext * s) decode_ext_header(w); s->pict_type = get_bits1(&s->gb) + 1; - if(s->pict_type == FF_I_TYPE){ + if(s->pict_type == AV_PICTURE_TYPE_I){ code = get_bits(&s->gb, 7); av_log(s->avctx, AV_LOG_DEBUG, "I7:%X/\n", code); } @@ -135,7 +135,7 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s) { Wmv2Context * const w= (Wmv2Context*)s; - if (s->pict_type == FF_I_TYPE) { + if (s->pict_type == AV_PICTURE_TYPE_I) { if(w->j_type_bit) w->j_type= get_bits1(&s->gb); else w->j_type= 0; //FIXME check @@ -342,7 +342,7 @@ int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) if(w->j_type) return 0; - if (s->pict_type == FF_P_TYPE) { + if (s->pict_type == AV_PICTURE_TYPE_P) { if(IS_SKIP(s->current_picture.mb_type[s->mb_y * s->mb_stride + s->mb_x])){ /* skip mb */ s->mb_intra = 0; @@ -419,7 +419,7 @@ int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) } } } else { -//if(s->pict_type==FF_P_TYPE) +//if(s->pict_type==AV_PICTURE_TYPE_P) // printf("%d%d ", s->inter_intra_pred, cbp); //printf("I at %d %d %d %06X\n", s->mb_x, s->mb_y, ((cbp&3)? 1 : 0) +((cbp&0x3C)? 2 : 0), show_bits(&s->gb, 24)); s->ac_pred = get_bits1(&s->gb); |