aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/pngdec.c
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2012-03-22 22:52:55 +0100
committerClément Bœsch <ubitux@gmail.com>2012-03-22 22:53:51 +0100
commit50a3867bab1762b98339d9ef9cafd05b4b3bcced (patch)
tree299e22b4755229cd7cf7cd2b2c82096059f70dce /libavcodec/pngdec.c
parentabdcb4918c14611b5771e1c3c256052041442267 (diff)
downloadandroid_external_ffmpeg-50a3867bab1762b98339d9ef9cafd05b4b3bcced.tar.gz
android_external_ffmpeg-50a3867bab1762b98339d9ef9cafd05b4b3bcced.tar.bz2
android_external_ffmpeg-50a3867bab1762b98339d9ef9cafd05b4b3bcced.zip
png: make ff_png_pass_mask local to pngdec.
Diffstat (limited to 'libavcodec/pngdec.c')
-rw-r--r--libavcodec/pngdec.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 8901874690..dd1f56b06c 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -67,6 +67,11 @@ typedef struct PNGDecContext {
z_stream zstream;
} PNGDecContext;
+/* Mask to determine which pixels are valid in a pass */
+static const uint8_t png_pass_mask[NB_PASSES] = {
+ 0x01, 0x01, 0x11, 0x11, 0x55, 0x55, 0xff,
+};
+
/* Mask to determine which y pixels can be written in a pass */
static const uint8_t png_pass_dsp_ymask[NB_PASSES] = {
0xff, 0xff, 0x0f, 0xff, 0x33, 0xff, 0x55,
@@ -88,7 +93,7 @@ static void png_put_interlaced_row(uint8_t *dst, int width,
uint8_t *d;
const uint8_t *s;
- mask = ff_png_pass_mask[pass];
+ mask = png_pass_mask[pass];
dsp_mask = png_pass_dsp_mask[pass];
switch(bits_per_pixel) {
case 1: