virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

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

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Paul B Mahol
2012-01-02 17:49:38 +00:00
committed by Michael Niedermayer
parent 12bdc7b15e
commit 7099f36578
10 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/bintext.c
View File

@@ -139,7 +139,7 @@ static int decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return -1;
} }
s->frame.pict_type = FF_I_TYPE; s->frame.pict_type = AV_PICTURE_TYPE_I;
s->frame.palette_has_changed = 1; s->frame.palette_has_changed = 1;
memcpy(s->frame.data[1], s->palette, 16 * 4); memcpy(s->frame.data[1], s->palette, 16 * 4);

4
libavcodec/flashsv2enc.c
View File

@@ -870,12 +870,12 @@ static int flashsv2_encode_frame(AVCodecContext * avctx, uint8_t * buf,
if (keyframe) { if (keyframe) {
new_key_frame(s); new_key_frame(s);
p->pict_type = FF_I_TYPE; p->pict_type = AV_PICTURE_TYPE_I;
p->key_frame = 1; p->key_frame = 1;
s->last_key_frame = avctx->frame_number; s->last_key_frame = avctx->frame_number;
av_log(avctx, AV_LOG_DEBUG, "Inserting key frame at frame %d\n", avctx->frame_number); av_log(avctx, AV_LOG_DEBUG, "Inserting key frame at frame %d\n", avctx->frame_number);
} else { } else {
p->pict_type = FF_P_TYPE; p->pict_type = AV_PICTURE_TYPE_P;
p->key_frame = 0; p->key_frame = 0;
} }

2
libavcodec/j2kdec.c
View File

@@ -274,7 +274,7 @@ static int get_siz(J2kDecoderContext *s)
if ((ret = s->avctx->get_buffer(s->avctx, &s->picture)) < 0) if ((ret = s->avctx->get_buffer(s->avctx, &s->picture)) < 0)
return ret; return ret;
s->picture.pict_type = FF_I_TYPE; s->picture.pict_type = AV_PICTURE_TYPE_I;
s->picture.key_frame = 1; s->picture.key_frame = 1;
return 0; return 0;

2
libavcodec/msvideo1enc.c
View File

@@ -243,7 +243,7 @@ static int encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_size, void
c->keyint = 0; c->keyint = 0;
else else
c->keyint++; 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; p->key_frame= keyframe;
return dst - buf; return dst - buf;

2
libavcodec/proresdec2.c
View File

@@ -73,7 +73,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
ff_proresdsp_init(&ctx->prodsp, avctx); ff_proresdsp_init(&ctx->prodsp, avctx);
avctx->coded_frame = &ctx->frame; avctx->coded_frame = &ctx->frame;
ctx->frame.type = FF_I_TYPE; ctx->frame.type = AV_PICTURE_TYPE_I;
ctx->frame.key_frame = 1; ctx->frame.key_frame = 1;
ff_init_scantable_permutation(idct_permutation, ff_init_scantable_permutation(idct_permutation,

2
libavcodec/v410dec.c
View File

@@ -67,7 +67,7 @@ static int v410_decode_frame(AVCodecContext *avctx, void *data,
} }
pic->key_frame = 1; pic->key_frame = 1;
pic->pict_type = FF_I_TYPE; pic->pict_type = AV_PICTURE_TYPE_I;
y = (uint16_t *)pic->data[0]; y = (uint16_t *)pic->data[0];
u = (uint16_t *)pic->data[1]; u = (uint16_t *)pic->data[1];

2
libavcodec/v410enc.c
View File

@@ -57,7 +57,7 @@ static int v410_encode_frame(AVCodecContext *avctx, uint8_t *buf,
avctx->coded_frame->reference = 0; avctx->coded_frame->reference = 0;
avctx->coded_frame->key_frame = 1; 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]; y = (uint16_t *)pic->data[0];
u = (uint16_t *)pic->data[1]; u = (uint16_t *)pic->data[1];

2
libavcodec/vble.c
View File

@@ -134,7 +134,7 @@ static int vble_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
/* Set flags */ /* Set flags */
pic->key_frame = 1; pic->key_frame = 1;
pic->pict_type = FF_I_TYPE; pic->pict_type = AV_PICTURE_TYPE_I;
/* Version should always be 1 */ /* Version should always be 1 */
version = AV_RL32(src); version = AV_RL32(src);

2
libavcodec/y41pdec.c
View File

@@ -64,7 +64,7 @@ static int y41p_decode_frame(AVCodecContext *avctx, void *data,
} }
pic->key_frame = 1; 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--) { for (i = avctx->height - 1; i >= 0 ; i--) {
y = &pic->data[0][i * pic->linesize[0]]; y = &pic->data[0][i * pic->linesize[0]];

2
libavcodec/y41penc.c
View File

@@ -54,7 +54,7 @@ static int y41p_encode_frame(AVCodecContext *avctx, uint8_t *buf,
avctx->coded_frame->reference = 0; avctx->coded_frame->reference = 0;
avctx->coded_frame->key_frame = 1; 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--) { for (i = avctx->height - 1; i >= 0; i--) {
y = &pic->data[0][i * pic->linesize[0]]; y = &pic->data[0][i * pic->linesize[0]];