OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e1f9077
)
h264: drop redundant initialization of the scaling matrices
author
Anton Khirnov
<anton@khirnov.net>
Sun, 29 Mar 2015 10:18:36 +0000
(12:18 +0200)
committer
Anton Khirnov
<anton@khirnov.net>
Sun, 5 Apr 2015 10:02:57 +0000
(12:02 +0200)
It will always be initialized when actually parsing the PPS.
libavcodec/h264.c
patch
|
blob
|
history
diff --git
a/libavcodec/h264.c
b/libavcodec/h264.c
index
f7857db
..
8d5ce45
100644
(file)
--- 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)