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/h264.h | |
| parent | 301183d9be4e426d472d4be8c84095c853cb8ac4 (diff) | |
replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index a0f688d180..efb11fd190 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -1118,7 +1118,7 @@ static void fill_decode_caches(H264Context *h, int mb_type){ } AV_ZERO16(h->mvd_cache [list][scan8[4 ]]); AV_ZERO16(h->mvd_cache [list][scan8[12]]); - if(h->slice_type_nos == FF_B_TYPE){ + if(h->slice_type_nos == AV_PICTURE_TYPE_B){ fill_rectangle(&h->direct_cache[scan8[0]], 4, 4, 8, MB_TYPE_16x16>>1, 1); if(IS_DIRECT(top_type)){ @@ -1255,7 +1255,7 @@ static inline void write_back_motion(H264Context *h, int mb_type){ } } - if(h->slice_type_nos == FF_B_TYPE && CABAC){ + if(h->slice_type_nos == AV_PICTURE_TYPE_B && CABAC){ if(IS_8X8(mb_type)){ uint8_t *direct_table = &h->direct_table[4*h->mb_xy]; direct_table[1] = h->sub_mb_type[1]>>1; @@ -1286,7 +1286,7 @@ static void av_unused decode_mb_skip(H264Context *h){ if(MB_FIELD) mb_type|= MB_TYPE_INTERLACED; - if( h->slice_type_nos == FF_B_TYPE ) + if( h->slice_type_nos == AV_PICTURE_TYPE_B ) { // just for fill_caches. pred_direct_motion will set the real mb_type mb_type|= MB_TYPE_L0L1|MB_TYPE_DIRECT2|MB_TYPE_SKIP; |