summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-03-21 16:12:44 +0100
committerAnton Khirnov <anton@khirnov.net>2015-04-05 12:02:26 +0200
commit43fd3dd80ca2d1c2ccf6a7b7632db544c809c690 (patch)
treed81780cca108596fb555243f15e393572d92886f
parent050324d020f843ce333276ebb6f27cc6026f37d0 (diff)
downloadffmpeg-streaming-43fd3dd80ca2d1c2ccf6a7b7632db544c809c690.zip
ffmpeg-streaming-43fd3dd80ca2d1c2ccf6a7b7632db544c809c690.tar.gz
h264: drop redundant initialization in init()
There is no real advantage to initializing any of those in init, assuming yuv420, before the real stream parameters are known.
-rw-r--r--libavcodec/h264.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 92541f6..311f5bb 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -592,18 +592,7 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx)
h->avctx = avctx;
- h->bit_depth_luma = 8;
- h->chroma_format_idc = 1;
-
- ff_h264dsp_init(&h->h264dsp, 8, 1);
- ff_h264chroma_init(&h->h264chroma, h->sps.bit_depth_chroma);
- ff_h264qpel_init(&h->h264qpel, 8);
- ff_h264_pred_init(&h->hpc, h->avctx->codec_id, 8, 1);
-
h->dequant_coeff_pps = -1;
-
- /* needed so that IDCT permutation is known early */
- ff_videodsp_init(&h->vdsp, 8);
h->cur_chroma_format_idc = -1;
memset(h->pps.scaling_matrix4, 16, 6 * 16 * sizeof(uint8_t));
@@ -625,9 +614,6 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx)
ff_init_cabac_states();
- h->pixel_shift = 0;
- h->sps.bit_depth_luma = avctx->bits_per_raw_sample = 8;
-
h->nb_slice_ctx = (avctx->active_thread_type & FF_THREAD_SLICE) ? H264_MAX_THREADS : 1;
h->slice_ctx = av_mallocz_array(h->nb_slice_ctx, sizeof(*h->slice_ctx));
if (!h->slice_ctx) {
OpenPOWER on IntegriCloud