X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fpng.h;h=b8c72eebc9e2c8923e9037bd029cdff612873fa9;hb=eb335f3c5ce37f2b93c993e28404d113bee843bc;hp=6e16f62e0fedfa2f6c89e5d83fcda7f21e3810ac;hpb=042e0adda9fd3ae1322ef51f9edbceffe3ae0941;p=ffmpeg

diff --git a/libavcodec/png.h b/libavcodec/png.h
index 6e16f62e0fe..b8c72eebc9e 100644
--- a/libavcodec/png.h
+++ b/libavcodec/png.h
@@ -1,26 +1,26 @@
 /*
  * PNG image format
- * Copyright (c) 2003 Fabrice Bellard.
+ * Copyright (c) 2003 Fabrice Bellard
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav 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.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav 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 FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * 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>
 
@@ -55,23 +55,18 @@ 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];
 
-/* minimum x value */
-extern const uint8_t ff_png_pass_xmin[NB_PASSES];
-
-/* x shift to get row width */
-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);
+
+void ff_add_png_paeth_prediction(uint8_t *dst, uint8_t *src, uint8_t *top, int w, int bpp);
 
-#endif /* FFMPEG_PNG_H */
+#endif /* AVCODEC_PNG_H */