summaryrefslogtreecommitdiff
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-01-28 12:38:57 +0100
committerAnton Khirnov <anton@khirnov.net>2015-03-21 11:27:15 +0100
commit5bc69f38c1af71fbcbfb4b5efa77d0aeb5424c04 (patch)
tree5e93c5706cde877d32cb99f22241b4e88a63a1b4 /libavcodec/h264.c
parentc377e04d8aa74d030672e9a4788a700b0695fc14 (diff)
error_resilience: do not require mbintra/skip tables
h264dec does not use them at all and only allocates them for ER.
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index b711c64fac..007ba2a6b0 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -383,8 +383,6 @@ void ff_h264_free_tables(H264Context *h, int free_rbsp)
av_freep(&hx->er.mb_index2xy);
av_freep(&hx->er.error_status_table);
av_freep(&hx->er.er_temp_buffer);
- av_freep(&hx->er.mbintra_table);
- av_freep(&hx->er.mbskip_table);
if (free_rbsp) {
av_freep(&hx->rbsp_buffer);
@@ -524,11 +522,6 @@ int ff_h264_context_init(H264Context *h)
FF_ALLOCZ_OR_GOTO(h->avctx, er->error_status_table,
mb_array_size * sizeof(uint8_t), fail);
- FF_ALLOC_OR_GOTO(h->avctx, er->mbintra_table, mb_array_size, fail);
- memset(er->mbintra_table, 1, mb_array_size);
-
- FF_ALLOCZ_OR_GOTO(h->avctx, er->mbskip_table, mb_array_size + 2, fail);
-
FF_ALLOC_OR_GOTO(h->avctx, er->er_temp_buffer,
h->mb_height * h->mb_stride, fail);