lavc: Add spherical packet side data API

[ffmpeg] / libavcodec / png.c

diff --git a/libavcodec/png.c b/libavcodec/png.c
index 70a080e29e3326d8b85db65e3b9c398fef2a605c..cd75dc18152cdc47790d02784bf990e63037b105 100644 (file)
--- a/libavcodec/png.c
+++ b/libavcodec/png.c
@@ -22,8 +22,8 @@
 #include "bytestream.h"
 #include "png.h"
 
-const uint8_t ff_pngsig[8] = {137, 80, 78, 71, 13, 10, 26, 10};
-const uint8_t ff_mngsig[8] = {138, 77, 78, 71, 13, 10, 26, 10};
+const uint8_t ff_pngsig[8] = { 137, 80, 78, 71, 13, 10, 26, 10 };
+const uint8_t ff_mngsig[8] = { 138, 77, 78, 71, 13, 10, 26, 10 };
 
 /* Mask to determine which y pixels are valid in a pass */
 const uint8_t ff_png_pass_ymask[NB_PASSES] = {
@@ -47,9 +47,7 @@ const uint8_t ff_png_pass_mask[NB_PASSES] = {
 
 void *ff_png_zalloc(void *opaque, unsigned int items, unsigned int size)
 {
-    if(items >= UINT_MAX / size)
-        return NULL;
-    return av_malloc(items * size);
+    return av_mallocz_array(items, size);
 }
 
 void ff_png_zfree(void *opaque, void *ptr)
@@ -77,7 +75,7 @@ int ff_png_pass_row_size(int pass, int bits_per_pixel, int width)
     xmin = ff_png_pass_xmin[pass];
     if (width <= xmin)
         return 0;
-    shift = ff_png_pass_xshift[pass];
+    shift      = ff_png_pass_xshift[pass];
     pass_width = (width - xmin + (1 << shift) - 1) >> shift;
     return (pass_width * bits_per_pixel + 7) >> 3;
 }