diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-04-12 21:08:34 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-04-29 05:52:58 +0200 |
| commit | 7a4f74eed51f914e9bbfebaffd4a92ac6791f819 (patch) | |
| tree | 3cadebcc17e8f835fd5e86b1234ce06da1432566 /libavcodec | |
| parent | 88c612e3a4d5b584e2d9f6e2541de78d67bdfb9f (diff) | |
| download | ffmpeg-7a4f74eed51f914e9bbfebaffd4a92ac6791f819.tar.gz | |
h264: embed the DPB in the context
It now has a fixed size and is initialized only once, so there is no
point in allocating it separately.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 15 | ||||
| -rw-r--r-- | libavcodec/h264.h | 2 |
2 files changed, 5 insertions, 12 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 20de3254a9..2756edb4fe 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -590,9 +590,6 @@ static int h264_init_context(AVCodecContext *avctx, H264Context *h) return AVERROR(ENOMEM); } - h->DPB = av_mallocz_array(H264_MAX_PICTURE_COUNT, sizeof(*h->DPB)); - if (!h->DPB) - return AVERROR(ENOMEM); for (i = 0; i < H264_MAX_PICTURE_COUNT; i++) av_frame_unref(&h->DPB[i].f); av_frame_unref(&h->cur_pic.f); @@ -1052,9 +1049,8 @@ static void flush_dpb(AVCodecContext *avctx) ff_h264_flush_change(h); - if (h->DPB) - for (i = 0; i < H264_MAX_PICTURE_COUNT; i++) - ff_h264_unref_picture(h, &h->DPB[i]); + for (i = 0; i < H264_MAX_PICTURE_COUNT; i++) + ff_h264_unref_picture(h, &h->DPB[i]); h->cur_pic_ptr = NULL; ff_h264_unref_picture(h, &h->cur_pic); @@ -1698,11 +1694,8 @@ av_cold void ff_h264_free_context(H264Context *h) ff_h264_free_tables(h); - if (h->DPB) { - for (i = 0; i < H264_MAX_PICTURE_COUNT; i++) - ff_h264_unref_picture(h, &h->DPB[i]); - av_freep(&h->DPB); - } + for (i = 0; i < H264_MAX_PICTURE_COUNT; i++) + ff_h264_unref_picture(h, &h->DPB[i]); h->cur_pic_ptr = NULL; diff --git a/libavcodec/h264.h b/libavcodec/h264.h index ca26e616ba..635c4a4db9 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -468,7 +468,7 @@ typedef struct H264Context { H264QpelContext h264qpel; GetBitContext gb; - H264Picture *DPB; + H264Picture DPB[H264_MAX_PICTURE_COUNT]; H264Picture *cur_pic_ptr; H264Picture cur_pic; |