RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-04 22:30:25 +00:00
Code Issues Projects Releases Wiki Activity

mpegvideo: call av_frame_unref() instead of avcodec_get_frame_defaults().

Browse Source 
This is a temporary workaround to allow deprecating
avcodec_get_frame_defaults(). The proper solution will be using a
properly allocated AVFrame in Picture.
This commit is contained in:
Anton Khirnov 2013-12-09 11:51:31 +01:00
parent b06c8bce02
commit 2d1f4288dd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mpegvideo.c
View File

@ -1036,14 +1036,14 @@ av_cold int ff_MPV_common_init(MpegEncContext *s)
FF_ALLOCZ_OR_GOTO(s->avctx, s->picture, FF_ALLOCZ_OR_GOTO(s->avctx, s->picture,
MAX_PICTURE_COUNT * sizeof(Picture), fail); MAX_PICTURE_COUNT * sizeof(Picture), fail);
for (i = 0; i < MAX_PICTURE_COUNT; i++) { 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->next_picture, 0, sizeof(s->next_picture));
memset(&s->last_picture, 0, sizeof(s->last_picture)); memset(&s->last_picture, 0, sizeof(s->last_picture));
memset(&s->current_picture, 0, sizeof(s->current_picture)); memset(&s->current_picture, 0, sizeof(s->current_picture));
avcodec_get_frame_defaults(&s->next_picture.f); av_frame_unref(&s->next_picture.f);
avcodec_get_frame_defaults(&s->last_picture.f); av_frame_unref(&s->last_picture.f);
avcodec_get_frame_defaults(&s->current_picture.f); av_frame_unref(&s->current_picture.f);
if (s->width && s->height) { if (s->width && s->height) {
if (init_context_frame(s)) if (init_context_frame(s))