http: export ICY content type

[ffmpeg] / libavutil / imgutils.c

diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c
index b946d6dc0c55a1d1bd4bec6f0ccff70c328541ab..3060b0705f2a02c2427b7c0b17d97a66d869348d 100644 (file)
--- a/libavutil/imgutils.c
+++ b/libavutil/imgutils.c
@@ -21,6 +21,7 @@
  * misc image utilities
  */
 
+#include "avassert.h"
 #include "common.h"
 #include "imgutils.h"
 #include "internal.h"
@@ -244,6 +245,8 @@ void av_image_copy_plane(uint8_t       *dst, int dst_linesize,
 {
     if (!dst || !src)
         return;
+    av_assert0(abs(src_linesize) >= bytewidth);
+    av_assert0(abs(dst_linesize) >= bytewidth);
     for (;height > 0; height--) {
         memcpy(dst, src, bytewidth);
         dst += dst_linesize;
@@ -277,7 +280,7 @@ void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4],
             int h = height;
             int bwidth = av_image_get_linesize(pix_fmt, width, i);
             if (bwidth < 0) {
-                av_log(0, AV_LOG_ERROR, "av_image_get_linesize failed\n");
+                av_log(NULL, AV_LOG_ERROR, "av_image_get_linesize failed\n");
                 return;
             }
             if (i == 1 || i == 2) {