summaryrefslogtreecommitdiff
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-01-28 19:28:18 +0100
committerAnton Khirnov <anton@khirnov.net>2015-03-21 11:27:16 +0100
commit5bf3c0fa49afd5bbf43aa841ff78007d72c80736 (patch)
tree2ed5cac812f8a4fa210507ed467a788d0daec15c /libavcodec/h264.c
parent51d8725a6e4c7f989d6f0f38b59cb54a2d72846c (diff)
h264: drop the now unused per-slice H264Contexts
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 48ffeabbcd..d26cbfdf13 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -344,7 +344,6 @@ static int decode_rbsp_trailing(H264Context *h, const uint8_t *src)
void ff_h264_free_tables(H264Context *h, int free_rbsp)
{
int i;
- H264Context *hx;
av_freep(&h->intra4x4_pred_mode);
av_freep(&h->chroma_pred_mode_table);
@@ -376,15 +375,6 @@ void ff_h264_free_tables(H264Context *h, int free_rbsp)
h->cur_pic_ptr = NULL;
- for (i = 0; i < H264_MAX_THREADS; i++) {
- hx = h->thread_context[i];
- if (!hx)
- continue;
-
- if (i)
- av_freep(&h->thread_context[i]);
- }
-
for (i = 0; i < h->nb_slice_ctx; i++) {
H264SliceContext *sl = &h->slice_ctx[i];
@@ -653,7 +643,6 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx)
return AVERROR(ENOMEM);
}
- h->thread_context[0] = h;
for (i = 0; i < h->nb_slice_ctx; i++)
h->slice_ctx[i].h264 = h;