On 2015-04-12 21:14:30 +0200, Anton Khirnov wrote:
> It now has a fixed size and is initialized only once, so there is no
> point in allocating it separately.
> ---
> libavcodec/h264.c | 15 ++++-----------
> libavcodec/h264.h | 2 +-
> 2 files changed, 5 insertions(+), 12 deletions(-)
>
> diff --git a/libavcodec/h264.c b/libavcodec/h264.c
> index a5f3dd4..148e23d 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 0ceae1c..2bc3631 100644
> --- a/libavcodec/h264.h
> +++ b/libavcodec/h264.h
> @@ -467,7 +467,7 @@ typedef struct H264Context {
> H264QpelContext h264qpel;
> GetBitContext gb;
>
> - H264Picture *DPB;
> + H264Picture DPB[H264_MAX_PICTURE_COUNT];
> H264Picture *cur_pic_ptr;
> H264Picture cur_pic;
ok
Janne
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
