RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-05 23:00:02 +00:00
Code Issues Projects Releases Wiki Activity

h264: remove unused H264SliceContext.rbsp_buffer

Browse Source
This commit is contained in:
Anton Khirnov 2016-04-11 16:04:05 +02:00
parent 7f045c4429
commit 0e7772c5e4
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/h264.c
View File

@ -337,8 +337,6 @@ static av_cold int h264_decode_end(AVCodecContext *avctx)
h->cur_pic_ptr = NULL; 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); av_freep(&h->slice_ctx);
h->nb_slice_ctx = 0; h->nb_slice_ctx = 0;
@ -952,9 +950,7 @@ again:
av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n"); av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n");
sl->ref_count[0] = sl->ref_count[1] = sl->list_count = 0; sl->ref_count[0] = sl->ref_count[1] = sl->list_count = 0;
} else if (err == 1) { } else if (err == 1) {
/* Slice could not be decoded in parallel mode, restart. Note /* Slice could not be decoded in parallel mode, restart. */
* that rbsp_buffer is not transferred, but since we no longer
* run in parallel mode this should not be an issue. */
sl = &h->slice_ctx[0]; sl = &h->slice_ctx[0];
goto again; goto again;
} }

4
libavcodec/h264.h
View File

@ -435,10 +435,6 @@ typedef struct H264SliceContext {
CABACContext cabac; CABACContext cabac;
uint8_t cabac_state[1024]; uint8_t cabac_state[1024];
int cabac_init_idc; int cabac_init_idc;
// rbsp buffer used for this slice
uint8_t *rbsp_buffer;
unsigned int rbsp_buffer_size;
} H264SliceContext; } H264SliceContext;
/** /**