diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 00:25:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 00:25:31 +0100 |
| commit | e3578fd525e94bfec16de1dfd0e5a49f18a0e0fd (patch) | |
| tree | 64be727821a3d423a5d5233a2b1905c7add49efb | |
| parent | 525a7d9b78683ce0e44a97283eb7ed23d36ae688 (diff) | |
| parent | 598ce4ab4f1893e0661fc038101487e511937877 (diff) | |
| download | ffmpeg-e3578fd525e94bfec16de1dfd0e5a49f18a0e0fd.tar.gz | |
Merge commit '598ce4ab4f1893e0661fc038101487e511937877'
* commit '598ce4ab4f1893e0661fc038101487e511937877':
h264: call av_frame_unref() instead of avcodec_get_frame_defaults().
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 0028227d78..90c4ca8031 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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); |