make state transition tables global as they are constant and the code is slightly...

[ffmpeg] / libavcodec / png.c

diff --git a/libavcodec/png.c b/libavcodec/png.c
index 2e45787551e639434a29537a9654c47a2be06133..0dd9eaec23fce01ecc59640f905df3d6bfbd6d0f 100644 (file)
--- a/libavcodec/png.c
+++ b/libavcodec/png.c
@@ -2,19 +2,21 @@
  * PNG image format
  * Copyright (c) 2003 Fabrice Bellard.
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avcodec.h"
 
@@ -90,12 +92,14 @@ static unsigned int get32(uint8_t **b){
     return ((*b)[-4]<<24) + ((*b)[-3]<<16) + ((*b)[-2]<<8) + (*b)[-1];
 }
 
+#ifdef CONFIG_ENCODERS
 static void put32(uint8_t **b, unsigned int v){
     *(*b)++= v>>24;
     *(*b)++= v>>16;
     *(*b)++= v>>8;
     *(*b)++= v;
 }
+#endif
 
 static const uint8_t pngsig[8] = {137, 80, 78, 71, 13, 10, 26, 10};
 
@@ -233,6 +237,7 @@ static void png_put_interlaced_row(uint8_t *dst, int width,
     }
 }
 
+#ifdef CONFIG_ENCODERS
 static void png_get_interlaced_row(uint8_t *dst, int row_size,
                                    int bits_per_pixel, int pass,
                                    const uint8_t *src, int width)
@@ -270,6 +275,7 @@ static void png_get_interlaced_row(uint8_t *dst, int row_size,
         break;
     }
 }
+#endif
 
 /* XXX: optimize */
 /* NOTE: 'dst' can be equal to 'last' */
@@ -338,6 +344,7 @@ static void png_filter_row(uint8_t *dst, int filter_type,
     }
 }
 
+#ifdef CONFIG_ENCODERS
 static void convert_from_rgba32(uint8_t *dst, const uint8_t *src, int width)
 {
     uint8_t *d;
@@ -346,7 +353,7 @@ static void convert_from_rgba32(uint8_t *dst, const uint8_t *src, int width)
 
     d = dst;
     for(j = 0; j < width; j++) {
-        v = ((uint32_t *)src)[j];
+        v = ((const uint32_t *)src)[j];
         d[0] = v >> 16;
         d[1] = v >> 8;
         d[2] = v;
@@ -354,7 +361,9 @@ static void convert_from_rgba32(uint8_t *dst, const uint8_t *src, int width)
         d += 4;
     }
 }
+#endif
 
+#ifdef CONFIG_DECODERS
 static void convert_to_rgba32(uint8_t *dst, const uint8_t *src, int width)
 {
     int j;
@@ -507,7 +516,7 @@ static int decode_frame(AVCodecContext *avctx,
         tag32 = get32(&s->bytestream);
         tag = bswap_32(tag32);
 #ifdef DEBUG
-        printf("png: tag=%c%c%c%c length=%u\n",
+        av_log(avctx, AV_LOG_DEBUG, "png: tag=%c%c%c%c length=%u\n",
                (tag & 0xff),
                ((tag >> 8) & 0xff),
                ((tag >> 16) & 0xff),
@@ -531,7 +540,7 @@ static int decode_frame(AVCodecContext *avctx,
             crc = get32(&s->bytestream);
             s->state |= PNG_IHDR;
 #ifdef DEBUG
-            printf("width=%d height=%d depth=%d color_type=%d compression_type=%d filter_type=%d interlace_type=%d\n",
+            av_log(avctx, AV_LOG_DEBUG, "width=%d height=%d depth=%d color_type=%d compression_type=%d filter_type=%d interlace_type=%d\n",
                    s->width, s->height, s->bit_depth, s->color_type,
                    s->compression_type, s->filter_type, s->interlace_type);
 #endif
@@ -589,7 +598,7 @@ static int decode_frame(AVCodecContext *avctx,
                     s->crow_size = s->pass_row_size + 1;
                 }
 #ifdef DEBUG
-                printf("row_size=%d crow_size =%d\n",
+                av_log(avctx, AV_LOG_DEBUG, "row_size=%d crow_size =%d\n",
                        s->row_size, s->crow_size);
 #endif
                 s->image_buf = p->data[0];
@@ -684,7 +693,9 @@ static int decode_frame(AVCodecContext *avctx,
     ret = -1;
     goto the_end;
 }
+#endif
 
+#ifdef CONFIG_ENCODERS
 static void png_write_chunk(uint8_t **f, uint32_t tag,
                             const uint8_t *buf, int length)
 {
@@ -736,6 +747,7 @@ static int png_write_row(PNGContext *s, const uint8_t *data, int size)
     }
     return 0;
 }
+#endif /* CONFIG_ENCODERS */
 
 static int common_init(AVCodecContext *avctx){
     PNGContext *s = avctx->priv_data;
@@ -747,6 +759,7 @@ static int common_init(AVCodecContext *avctx){
     return 0;
 }
 
+#ifdef CONFIG_ENCODERS
 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
     PNGContext *s = avctx->priv_data;
     AVFrame *pict = data;
@@ -920,7 +933,9 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
     ret = -1;
     goto the_end;
 }
+#endif
 
+#ifdef CONFIG_PNG_DECODER
 AVCodec png_decoder = {
     "png",
     CODEC_TYPE_VIDEO,
@@ -933,6 +948,7 @@ AVCodec png_decoder = {
     0 /*CODEC_CAP_DR1*/ /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
     NULL
 };
+#endif
 
 #ifdef CONFIG_PNG_ENCODER
 AVCodec png_encoder = {