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/h261dec.c | |
| parent | 301183d9be4e426d472d4be8c84095c853cb8ac4 (diff) | |
| download | ffmpeg-ce5e49b0c2c11ec153834677fc5c903dd71d4e6e.tar.gz | |
replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*
Diffstat (limited to 'libavcodec/h261dec.c')
| -rw-r--r-- | libavcodec/h261dec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index d732123d3e..108bd0e841 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -497,9 +497,9 @@ static int h261_decode_picture_header(H261Context *h){ skip_bits(&s->gb, 8); } - // h261 has no I-FRAMES, but if we pass FF_I_TYPE for the first frame, the codec crashes if it does + // h261 has no I-FRAMES, but if we pass AV_PICTURE_TYPE_I for the first frame, the codec crashes if it does // not contain all I-blocks (e.g. when a packet is lost) - s->pict_type = FF_P_TYPE; + s->pict_type = AV_PICTURE_TYPE_P; h->gob_number = 0; return 0; @@ -597,10 +597,10 @@ retry: // for skipping the frame s->current_picture.pict_type= s->pict_type; - s->current_picture.key_frame= s->pict_type == FF_I_TYPE; + s->current_picture.key_frame= s->pict_type == AV_PICTURE_TYPE_I; - if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==FF_B_TYPE) - ||(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=FF_I_TYPE) + if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==AV_PICTURE_TYPE_B) + ||(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=AV_PICTURE_TYPE_I) || avctx->skip_frame >= AVDISCARD_ALL) return get_consumed_bytes(s, buf_size); |