X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fpng.h;h=97e81f5628a2f297177e44369ad882dd20ed442b;hb=5b423887f4dcf2b200689e472b9e239a1cf86a6b;hp=3043471194158bcee2ab106c69d3f1567e0ef8f2;hpb=4a5b619df74ea6a5d476fc4f91cbb98b5aa5098a;p=ffmpeg

diff --git a/libavcodec/png.h b/libavcodec/png.h
index 30434711941..97e81f5628a 100644
--- a/libavcodec/png.h
+++ b/libavcodec/png.h
@@ -1,6 +1,6 @@
 /*
  * PNG image format
- * Copyright (c) 2003 Fabrice Bellard.
+ * Copyright (c) 2003 Fabrice Bellard
  *
  * This file is part of FFmpeg.
  *
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_PNG_H
-#define FFMPEG_PNG_H
+#ifndef AVCODEC_PNG_H
+#define AVCODEC_PNG_H
 
 #include <stdint.h>
 
@@ -34,6 +34,7 @@
 #define PNG_COLOR_TYPE_RGB_ALPHA  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_ALPHA)
 #define PNG_COLOR_TYPE_GRAY_ALPHA (PNG_COLOR_MASK_ALPHA)
 
+#define PNG_FILTER_TYPE_LOCO   64
 #define PNG_FILTER_VALUE_NONE  0
 #define PNG_FILTER_VALUE_SUB   1
 #define PNG_FILTER_VALUE_UP    2
@@ -49,6 +50,7 @@
 #define NB_PASSES 7
 
 extern const uint8_t ff_pngsig[8];
+extern const uint8_t ff_mngsig[8];
 
 /* Mask to determine which y pixels are valid in a pass */
 extern const uint8_t ff_png_pass_ymask[NB_PASSES];
@@ -62,14 +64,13 @@ extern const uint8_t ff_png_pass_xshift[NB_PASSES];
 /* Mask to determine which pixels are valid in a pass */
 extern const uint8_t ff_png_pass_mask[NB_PASSES];
 
-extern void *ff_png_zalloc(void *opaque, unsigned int items,
-                           unsigned int size);
+void *ff_png_zalloc(void *opaque, unsigned int items, unsigned int size);
 
-extern void ff_png_zfree(void *opaque, void *ptr);
+void ff_png_zfree(void *opaque, void *ptr);
 
-extern int ff_png_get_nb_channels(int color_type);
+int ff_png_get_nb_channels(int color_type);
 
 /* compute the row size of an interleaved pass */
-extern int ff_png_pass_row_size(int pass, int bits_per_pixel, int width);
+int ff_png_pass_row_size(int pass, int bits_per_pixel, int width);
 
-#endif /* FFMPEG_PNG_H */
+#endif /* AVCODEC_PNG_H */