From 2d1f4288dd02a624cb8b86ab06371d6434c9da69 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 9 Dec 2013 11:51:31 +0100 Subject: [PATCH] mpegvideo: call av_frame_unref() instead of avcodec_get_frame_defaults(). This is a temporary workaround to allow deprecating avcodec_get_frame_defaults(). The proper solution will be using a properly allocated AVFrame in Picture. --- libavcodec/mpegvideo.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 55fd935b2f..f39cdca3da 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1036,14 +1036,14 @@ av_cold int ff_MPV_common_init(MpegEncContext *s) FF_ALLOCZ_OR_GOTO(s->avctx, s->picture, MAX_PICTURE_COUNT * sizeof(Picture), fail); for (i = 0; i < MAX_PICTURE_COUNT; i++) { - avcodec_get_frame_defaults(&s->picture[i].f); + av_frame_unref(&s->picture[i].f); } memset(&s->next_picture, 0, sizeof(s->next_picture)); memset(&s->last_picture, 0, sizeof(s->last_picture)); memset(&s->current_picture, 0, sizeof(s->current_picture)); - avcodec_get_frame_defaults(&s->next_picture.f); - avcodec_get_frame_defaults(&s->last_picture.f); - avcodec_get_frame_defaults(&s->current_picture.f); + av_frame_unref(&s->next_picture.f); + av_frame_unref(&s->last_picture.f); + av_frame_unref(&s->current_picture.f); if (s->width && s->height) { if (init_context_frame(s))