[FFmpeg-cvslog] h264: remove unused H264SliceContext.rbsp_buffer
Anton Khirnov
git at videolan.org
Mon Jun 20 12:10:13 CEST 2016
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon Apr 11 16:04:05 2016 +0200| [0e7772c5e4f1b31e2a3dda714ba4f89b1cca644a] | committer: Anton Khirnov
h264: remove unused H264SliceContext.rbsp_buffer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e7772c5e4f1b31e2a3dda714ba4f89b1cca644a
---
libavcodec/h264.c | 6 +-----
libavcodec/h264.h | 4 ----
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 9d7b69c..9cc0a24 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -337,8 +337,6 @@ static av_cold int h264_decode_end(AVCodecContext *avctx)
h->cur_pic_ptr = NULL;
- for (i = 0; i < h->nb_slice_ctx; i++)
- av_freep(&h->slice_ctx[i].rbsp_buffer);
av_freep(&h->slice_ctx);
h->nb_slice_ctx = 0;
@@ -952,9 +950,7 @@ again:
av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n");
sl->ref_count[0] = sl->ref_count[1] = sl->list_count = 0;
} else if (err == 1) {
- /* Slice could not be decoded in parallel mode, restart. Note
- * that rbsp_buffer is not transferred, but since we no longer
- * run in parallel mode this should not be an issue. */
+ /* Slice could not be decoded in parallel mode, restart. */
sl = &h->slice_ctx[0];
goto again;
}
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 6c03e5e..7944927 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -435,10 +435,6 @@ typedef struct H264SliceContext {
CABACContext cabac;
uint8_t cabac_state[1024];
int cabac_init_idc;
-
- // rbsp buffer used for this slice
- uint8_t *rbsp_buffer;
- unsigned int rbsp_buffer_size;
} H264SliceContext;
/**
More information about the ffmpeg-cvslog
mailing list