diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-20 12:07:05 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-20 12:07:10 +0200 |
| commit | cbe2dc7275bb7f488cbb6c8cdf98a5f26355c279 (patch) | |
| tree | 5a69149d2fe8a94ab5d0a04712487c38d1b04162 | |
| parent | c957909a9f48196bfb4cb295c750ec6d495d7bbb (diff) | |
| parent | 0e7772c5e4f1b31e2a3dda714ba4f89b1cca644a (diff) | |
Merge commit '0e7772c5e4f1b31e2a3dda714ba4f89b1cca644a'
* commit '0e7772c5e4f1b31e2a3dda714ba4f89b1cca644a':
h264: remove unused H264SliceContext.rbsp_buffer
Merged-by: Clément Bœsch <clement@stupeflix.com>
| -rw-r--r-- | libavcodec/h264.c | 6 | ||||
| -rw-r--r-- | libavcodec/h264.h | 4 |
2 files changed, 1 insertions, 9 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index bd9f67292a..812e7c0027 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -373,8 +373,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; @@ -1108,9 +1106,7 @@ FF_ENABLE_DEPRECATION_WARNINGS goto end; context_count = 0; } - /* 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 010f6883e7..0cda19164e 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -450,10 +450,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; /** |