Browse Source

h264: remove unused H264SliceContext.rbsp_buffer

tags/n3.1
Anton Khirnov 9 years ago
parent
commit
0e7772c5e4
2 changed files with 1 additions and 9 deletions
  1. +1
    -5
      libavcodec/h264.c
  2. +0
    -4
      libavcodec/h264.h

+ 1
- 5
libavcodec/h264.c View File

@@ -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;
}


+ 0
- 4
libavcodec/h264.h View File

@@ -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;

/**


Loading…
Cancel
Save