Andreas Rheinhardt:
> These buffers are not shared in any way.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
> ---
> libavcodec/error_resilience.c | 18 +++++++++---------
> libavcodec/error_resilience.h | 4 ++--
> 2 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
> index f957c68d2c..2aa6f1d864 100644
> --- a/libavcodec/error_resilience.c
> +++ b/libavcodec/error_resilience.c
> @@ -946,17 +946,17 @@ void ff_er_frame_end(ERContext *s)
> av_log(s->avctx, AV_LOG_ERROR, "Warning MVs not available\n");
>
> for (i = 0; i < 2; i++) {
> - s->ref_index_buf[i] = av_buffer_allocz(s->mb_stride *
> s->mb_height * 4 * sizeof(uint8_t));
> - s->motion_val_buf[i] = av_buffer_allocz((size + 4) * 2 *
> sizeof(uint16_t));
> - if (!s->ref_index_buf[i] || !s->motion_val_buf[i])
> + s->ref_index[i] = av_calloc(s->mb_stride * s->mb_height, 4
> * sizeof(uint8_t));
> + s->motion_val_base[i] = av_calloc(size + 4, 2 *
> sizeof(uint16_t));
> + if (!s->ref_index[i] || !s->motion_val_base[i])
> break;
> - s->cur_pic.ref_index[i] = s->ref_index_buf[i]->data;
> - s->cur_pic.motion_val[i] = (int16_t
> (*)[2])s->motion_val_buf[i]->data + 4;
> + s->cur_pic.ref_index[i] = s->ref_index[i];
> + s->cur_pic.motion_val[i] = s->motion_val_base[i] + 4;
> }
> if (i < 2) {
> for (i = 0; i < 2; i++) {
> - av_buffer_unref(&s->ref_index_buf[i]);
> - av_buffer_unref(&s->motion_val_buf[i]);
> + av_freep(&s->ref_index[i]);
> + av_freep(&s->motion_val_base[i]);
> s->cur_pic.ref_index[i] = NULL;
> s->cur_pic.motion_val[i] = NULL;
> }
> @@ -1343,8 +1343,8 @@ void ff_er_frame_end(ERContext *s)
> }
>
> for (i = 0; i < 2; i++) {
> - av_buffer_unref(&s->ref_index_buf[i]);
> - av_buffer_unref(&s->motion_val_buf[i]);
> + av_freep(&s->ref_index[i]);
> + av_freep(&s->motion_val_base[i]);
> s->cur_pic.ref_index[i] = NULL;
> s->cur_pic.motion_val[i] = NULL;
> }
> diff --git a/libavcodec/error_resilience.h b/libavcodec/error_resilience.h
> index 53e5cf2621..47cc8a4fc6 100644
> --- a/libavcodec/error_resilience.h
> +++ b/libavcodec/error_resilience.h
> @@ -75,8 +75,8 @@ typedef struct ERContext {
> ERPicture last_pic;
> ERPicture next_pic;
>
> - AVBufferRef *ref_index_buf[2];
> - AVBufferRef *motion_val_buf[2];
> + int8_t *ref_index[2];
> + int16_t (*motion_val_base[2])[2];
>
> uint16_t pp_time;
> uint16_t pb_time;
Will apply this patchset tomorrow unless there are objections.
- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
