highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '2d1f4288dd02a624cb8b86ab06371d6434c9da69'

Browse Source 
* commit '2d1f4288dd02a624cb8b86ab06371d6434c9da69':
  mpegvideo: call av_frame_unref() instead of avcodec_get_frame_defaults().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-12 00:07:50 +01:00
commit 3b2b07397c
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

@ -1047,14 +1047,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 (init_context_frame(s)) if (init_context_frame(s))
goto fail; goto fail;