aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-03-29 12:18:36 +0200
committerAnton Khirnov <anton@khirnov.net>2015-04-05 12:02:57 +0200
commit65afa65e7393e7745427e267d6c6ca814c7c8b45 (patch)
tree90504852e733404e8d65f341a89d4a5c95f72ec8 /libavcodec
parente1f907711a91e5ce19402a1831cfbe8f709b67f7 (diff)
downloadffmpeg-65afa65e7393e7745427e267d6c6ca814c7c8b45.tar.gz
h264: drop redundant initialization of the scaling matrices
It will always be initialized when actually parsing the PPS.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index f7857db7f6..8d5ce45c93 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -631,9 +631,6 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx)
if (ret < 0)
return ret;
- memset(h->pps.scaling_matrix4, 16, 6 * 16 * sizeof(uint8_t));
- memset(h->pps.scaling_matrix8, 16, 2 * 64 * sizeof(uint8_t));
-
/* set defaults */
// s->decode_mb = ff_h263_decode_mb;
if (!avctx->has_b_frames)