diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-05 22:04:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-05 22:04:58 +0200 |
| commit | 80a76905eb5c72f99cf046ae233fb7cfe7f86030 (patch) | |
| tree | e7d26a2dc028c366c839a0950e1008d72b2a0b2e /libavcodec/h264.c | |
| parent | abae926ef80c8553c732b95649d334b7a91374d3 (diff) | |
| parent | 65afa65e7393e7745427e267d6c6ca814c7c8b45 (diff) | |
| download | ffmpeg-80a76905eb5c72f99cf046ae233fb7cfe7f86030.tar.gz | |
Merge commit '65afa65e7393e7745427e267d6c6ca814c7c8b45'
* commit '65afa65e7393e7745427e267d6c6ca814c7c8b45':
h264: drop redundant initialization of the scaling matrices
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index d5da5861fe..dd2f89a6c0 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -658,9 +658,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) |