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/dxa.c | |
| parent | 301183d9be4e426d472d4be8c84095c853cb8ac4 (diff) | |
replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*
Diffstat (limited to 'libavcodec/dxa.c')
| -rw-r--r-- | libavcodec/dxa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c index 00156292c9..759cc907b5 100644 --- a/libavcodec/dxa.c +++ b/libavcodec/dxa.c @@ -240,13 +240,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac switch(compr){ case -1: c->pic.key_frame = 0; - c->pic.pict_type = FF_P_TYPE; + c->pic.pict_type = AV_PICTURE_TYPE_P; if(c->prev.data[0]) memcpy(c->pic.data[0], c->prev.data[0], c->pic.linesize[0] * avctx->height); else{ // Should happen only when first frame is 'NULL' memset(c->pic.data[0], 0, c->pic.linesize[0] * avctx->height); c->pic.key_frame = 1; - c->pic.pict_type = FF_I_TYPE; + c->pic.pict_type = AV_PICTURE_TYPE_I; } break; case 2: @@ -254,7 +254,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac case 4: case 5: c->pic.key_frame = !(compr & 1); - c->pic.pict_type = (compr & 1) ? FF_P_TYPE : FF_I_TYPE; + c->pic.pict_type = (compr & 1) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I; for(j = 0; j < avctx->height; j++){ if(compr & 1){ for(i = 0; i < avctx->width; i++) @@ -269,7 +269,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac case 12: // ScummVM coding case 13: c->pic.key_frame = 0; - c->pic.pict_type = FF_P_TYPE; + c->pic.pict_type = AV_PICTURE_TYPE_P; decode_13(avctx, c, c->pic.data[0], srcptr, c->prev.data[0]); break; default: |