lavc: replace rest of deprecated FF_*_TYPE with AV_PICTURE_TYPE_*

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavcodec/bintext.c b/libavcodec/bintext.c
index 0b46dd444e5ce5fb5b1832440cba72dbf7721a17..91167ba150bce5f71e5e23d524f4819c9e5e190a 100644 (file)
--- a/libavcodec/bintext.c
+++ b/libavcodec/bintext.c
@@ -139,7 +139,7 @@ static int decode_frame(AVCodecContext *avctx,
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return -1;
     }
-    s->frame.pict_type           = FF_I_TYPE;
+    s->frame.pict_type           = AV_PICTURE_TYPE_I;
     s->frame.palette_has_changed = 1;
     memcpy(s->frame.data[1], s->palette, 16 * 4);
 

diff --git a/libavcodec/flashsv2enc.c b/libavcodec/flashsv2enc.c
index 9f7017e033f420ea21b490818b77b83a9a0f66f3..6466be7858d7f02c743fe29c55b6045c3da0e629 100644 (file)
--- a/libavcodec/flashsv2enc.c
+++ b/libavcodec/flashsv2enc.c
@@ -870,12 +870,12 @@ static int flashsv2_encode_frame(AVCodecContext * avctx, uint8_t * buf,
 
     if (keyframe) {
         new_key_frame(s);
-        p->pict_type = FF_I_TYPE;
+        p->pict_type = AV_PICTURE_TYPE_I;
         p->key_frame = 1;
         s->last_key_frame = avctx->frame_number;
         av_log(avctx, AV_LOG_DEBUG, "Inserting key frame at frame %d\n", avctx->frame_number);
     } else {
-        p->pict_type = FF_P_TYPE;
+        p->pict_type = AV_PICTURE_TYPE_P;
         p->key_frame = 0;
     }
 

diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c
index 6989aa1cd73dd43d5329a0eac2c353a84ee632ad..2cbd7cc529aea902170de922087bb6fee82a9ba7 100644 (file)
--- a/libavcodec/j2kdec.c
+++ b/libavcodec/j2kdec.c
@@ -274,7 +274,7 @@ static int get_siz(J2kDecoderContext *s)
     if ((ret = s->avctx->get_buffer(s->avctx, &s->picture)) < 0)
         return ret;
 
-    s->picture.pict_type = FF_I_TYPE;
+    s->picture.pict_type = AV_PICTURE_TYPE_I;
     s->picture.key_frame = 1;
 
     return 0;

diff --git a/libavcodec/msvideo1enc.c b/libavcodec/msvideo1enc.c
index 401ac2a2ae89c0fe5d094e135d89cbd43dd0a075..971cce35e634c3d6a2ef4694c76e99e1818b4079 100644 (file)
--- a/libavcodec/msvideo1enc.c
+++ b/libavcodec/msvideo1enc.c
@@ -243,7 +243,7 @@ static int encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_size, void
         c->keyint = 0;
     else
         c->keyint++;
-    p->pict_type= keyframe ? FF_I_TYPE : FF_P_TYPE;
+    p->pict_type= keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
     p->key_frame= keyframe;
 
     return dst - buf;

diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c
index 18decae1166afd6124e39c0ca105022d13b451ac..fe4cfd09b862e781b49f4f2e0ae1930249b49424 100644 (file)
--- a/libavcodec/proresdec2.c
+++ b/libavcodec/proresdec2.c
@@ -73,7 +73,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
     ff_proresdsp_init(&ctx->prodsp, avctx);
 
     avctx->coded_frame = &ctx->frame;
-    ctx->frame.type = FF_I_TYPE;
+    ctx->frame.type = AV_PICTURE_TYPE_I;
     ctx->frame.key_frame = 1;
 
     ff_init_scantable_permutation(idct_permutation,

diff --git a/libavcodec/v410dec.c b/libavcodec/v410dec.c
index f600b5d493e0f9053b45ea6196ad0d5355d4bb96..10d73057afe20ddb9e049f6b0e2d4338e45ba76e 100644 (file)
--- a/libavcodec/v410dec.c
+++ b/libavcodec/v410dec.c
@@ -67,7 +67,7 @@ static int v410_decode_frame(AVCodecContext *avctx, void *data,
     }
 
     pic->key_frame = 1;
-    pic->pict_type = FF_I_TYPE;
+    pic->pict_type = AV_PICTURE_TYPE_I;
 
     y = (uint16_t *)pic->data[0];
     u = (uint16_t *)pic->data[1];

diff --git a/libavcodec/v410enc.c b/libavcodec/v410enc.c
index e7d9c4e3845293166be70176453033a11fb8ea37..bcd7c65bdc18f3efd1e1d739e1416a479f18f07c 100644 (file)
--- a/libavcodec/v410enc.c
+++ b/libavcodec/v410enc.c
@@ -57,7 +57,7 @@ static int v410_encode_frame(AVCodecContext *avctx, uint8_t *buf,
 
     avctx->coded_frame->reference = 0;
     avctx->coded_frame->key_frame = 1;
-    avctx->coded_frame->pict_type = FF_I_TYPE;
+    avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
 
     y = (uint16_t *)pic->data[0];
     u = (uint16_t *)pic->data[1];

diff --git a/libavcodec/vble.c b/libavcodec/vble.c
index cee153c979a9271e6db79adb8d11db6e17ce50dc..57b3599ddb975688084b05c0fba331db62c7283e 100644 (file)
--- a/libavcodec/vble.c
+++ b/libavcodec/vble.c
@@ -134,7 +134,7 @@ static int vble_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
 
     /* Set flags */
     pic->key_frame = 1;
-    pic->pict_type = FF_I_TYPE;
+    pic->pict_type = AV_PICTURE_TYPE_I;
 
     /* Version should always be 1 */
     version = AV_RL32(src);

diff --git a/libavcodec/y41pdec.c b/libavcodec/y41pdec.c
index ea9bf9282a57e6557485d38e4d9c80736481b38a..e66546b0fa03752f2c6abc1a5f00755bb8b725f5 100644 (file)
--- a/libavcodec/y41pdec.c
+++ b/libavcodec/y41pdec.c
@@ -64,7 +64,7 @@ static int y41p_decode_frame(AVCodecContext *avctx, void *data,
     }
 
     pic->key_frame = 1;
-    pic->pict_type = FF_I_TYPE;
+    pic->pict_type = AV_PICTURE_TYPE_I;
 
     for (i = avctx->height - 1; i >= 0 ; i--) {
         y = &pic->data[0][i * pic->linesize[0]];

diff --git a/libavcodec/y41penc.c b/libavcodec/y41penc.c
index b8b4a2e43b798c318b722f3f497b08037b31a425..aa32403a45d45bd0122acab3d523911484368281 100644 (file)
--- a/libavcodec/y41penc.c
+++ b/libavcodec/y41penc.c
@@ -54,7 +54,7 @@ static int y41p_encode_frame(AVCodecContext *avctx, uint8_t *buf,
 
     avctx->coded_frame->reference = 0;
     avctx->coded_frame->key_frame = 1;
-    avctx->coded_frame->pict_type = FF_I_TYPE;
+    avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
 
     for (i = avctx->height - 1; i >= 0; i--) {
         y = &pic->data[0][i * pic->linesize[0]];