diff options
Diffstat (limited to 'source/blender/imbuf/intern')
| -rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 12 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/indexer.c | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index e2da2e46478..a32cf401f70 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -556,12 +556,12 @@ static int startffmpeg(struct anim *anim) anim->next_pts = -1; anim->next_packet.stream_index = -1; - anim->pFrame = avcodec_alloc_frame(); + anim->pFrame = av_frame_alloc(); anim->pFrameComplete = false; - anim->pFrameDeinterlaced = avcodec_alloc_frame(); - anim->pFrameRGB = avcodec_alloc_frame(); + anim->pFrameDeinterlaced = av_frame_alloc(); + anim->pFrameRGB = av_frame_alloc(); - if (avpicture_get_size(PIX_FMT_RGBA, anim->x, anim->y) != + if (avpicture_get_size(AV_PIX_FMT_RGBA, anim->x, anim->y) != anim->x * anim->y * 4) { fprintf(stderr, @@ -600,7 +600,7 @@ static int startffmpeg(struct anim *anim) anim->pCodecCtx->pix_fmt, anim->x, anim->y, - PIX_FMT_RGBA, + AV_PIX_FMT_RGBA, SWS_FAST_BILINEAR | SWS_PRINT_INFO | SWS_FULL_CHR_H_INT, NULL, NULL, NULL); @@ -689,7 +689,7 @@ static void ffmpeg_postprocess(struct anim *anim) avpicture_fill((AVPicture *) anim->pFrameRGB, (unsigned char *) ibuf->rect, - PIX_FMT_RGBA, anim->x, anim->y); + AV_PIX_FMT_RGBA, anim->x, anim->y); if (ENDIAN_ORDER == B_ENDIAN) { int *dstStride = anim->pFrameRGB->linesize; diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index ac57b095800..a6012b1e88d 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -519,7 +519,7 @@ static struct proxy_output_ctx *alloc_proxy_output_ffmpeg( rv->c->pix_fmt = rv->codec->pix_fmts[0]; } else { - rv->c->pix_fmt = PIX_FMT_YUVJ420P; + rv->c->pix_fmt = AV_PIX_FMT_YUVJ420P; } rv->c->sample_aspect_ratio = @@ -554,7 +554,7 @@ static struct proxy_output_ctx *alloc_proxy_output_ffmpeg( if (st->codec->width != width || st->codec->height != height || st->codec->pix_fmt != rv->c->pix_fmt) { - rv->frame = avcodec_alloc_frame(); + rv->frame = av_frame_alloc(); avpicture_fill((AVPicture *) rv->frame, MEM_mallocN(avpicture_get_size( rv->c->pix_fmt, @@ -905,7 +905,7 @@ static int index_rebuild_ffmpeg(FFmpegIndexBuilderContext *context, memset(&next_packet, 0, sizeof(AVPacket)); - in_frame = avcodec_alloc_frame(); + in_frame = av_frame_alloc(); stream_size = avio_size(context->iFormatCtx->pb); |