lineage-rockchip/android_external_ffmpeg
1
0
Fork 0
Code Activity Actions

Merge commit '598ce4ab4f'

Browse source 
* commit '598ce4ab4f':
  h264: call av_frame_unref() instead of avcodec_get_frame_defaults().

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-12 00:25:31 +01:00
commit e3578fd525
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libavcodec/h264.c
View file

@ -1379,8 +1379,8 @@ int ff_h264_alloc_tables(H264Context *h)
if (!h->DPB)
return AVERROR(ENOMEM);
for (i = 0; i < MAX_PICTURE_COUNT; i++)
avcodec_get_frame_defaults(&h->DPB[i].f);
avcodec_get_frame_defaults(&h->cur_pic.f);
av_frame_unref(&h->DPB[i].f);
av_frame_unref(&h->cur_pic.f);
}
return 0;
@ -1815,7 +1815,7 @@ static int decode_update_thread_context(AVCodecContext *dst,
h->context_initialized = 0;
memset(&h->cur_pic, 0, sizeof(h->cur_pic));
avcodec_get_frame_defaults(&h->cur_pic.f);
av_frame_unref(&h->cur_pic.f);
h->cur_pic.tf.f = &h->cur_pic.f;
ret = ff_h264_alloc_tables(h);