X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fimgresample.c;h=8da1b4d315f3fb9392c60bafafe55437f8ac56cc;hb=d3b4b74c32cf302d36a4c4d2cce08027f0a22560;hp=b5c57ffd94c590dc186299327a06ac124ce18037;hpb=0e9fbd35b5544e7799db67302d3d7e2ea761b4c4;p=ffmpeg

diff --git a/libavcodec/imgresample.c b/libavcodec/imgresample.c
index b5c57ffd94c..8da1b4d315f 100644
--- a/libavcodec/imgresample.c
+++ b/libavcodec/imgresample.c
@@ -25,8 +25,8 @@
  */
 
 #include "avcodec.h"
-#include "swscale.h"
 #include "dsputil.h"
+#include "libswscale/swscale.h"
 
 #ifdef HAVE_ALTIVEC
 #include "ppc/imgresample_altivec.h"
@@ -48,7 +48,7 @@
 #define LINE_BUF_HEIGHT (NB_TAPS * 4)
 
 struct SwsContext {
-    AVClass *av_class;
+    const AVClass *av_class;
     struct ImgReSampleContext *resampling_ctx;
     enum PixelFormat src_pix_fmt, dst_pix_fmt;
 };
@@ -447,7 +447,7 @@ ImgReSampleContext *img_resample_full_init(int owidth, int oheight,
     if (!s)
         return NULL;
     if((unsigned)owidth >= UINT_MAX / (LINE_BUF_HEIGHT + NB_TAPS))
-        return NULL;
+        goto fail;
     s->line_buf = av_mallocz(owidth * (LINE_BUF_HEIGHT + NB_TAPS));
     if (!s->line_buf)
         goto fail;
@@ -512,7 +512,12 @@ void img_resample_close(ImgReSampleContext *s)
     av_free(s);
 }
 
-static const AVClass context_class = { "imgresample", NULL, NULL };
+static const char *context_to_name(void* ptr)
+{
+    return "imgconvert";
+}
+
+static const AVClass context_class = { "imgresample", context_to_name, NULL };
 
 struct SwsContext *sws_getContext(int srcW, int srcH, int srcFormat,
                                   int dstW, int dstH, int dstFormat,
@@ -531,7 +536,7 @@ struct SwsContext *sws_getContext(int srcW, int srcH, int srcFormat,
 
     if ((srcH != dstH) || (srcW != dstW)) {
         if ((srcFormat != PIX_FMT_YUV420P) || (dstFormat != PIX_FMT_YUV420P)) {
-            av_log(NULL, AV_LOG_INFO, "PIX_FMT_YUV420P will be used as an intermediate format for rescaling\n");
+            av_log(ctx, AV_LOG_INFO, "PIX_FMT_YUV420P will be used as an intermediate format for rescaling\n");
         }
         ctx->resampling_ctx = img_resample_init(dstW, dstH, srcW, srcH);
     } else {
@@ -634,7 +639,7 @@ int sws_scale(struct SwsContext *ctx, uint8_t* src[], int srcStride[],
                             &src_pict, ctx->src_pix_fmt,
                             ctx->resampling_ctx->iwidth, ctx->resampling_ctx->iheight) < 0) {
 
-                av_log(NULL, AV_LOG_ERROR, "pixel format conversion not handled\n");
+                av_log(ctx, AV_LOG_ERROR, "pixel format conversion not handled\n");
                 res = -1;
                 goto the_end;
             }
@@ -673,7 +678,7 @@ int sws_scale(struct SwsContext *ctx, uint8_t* src[], int srcStride[],
                         resampled_picture, current_pix_fmt,
                         ctx->resampling_ctx->owidth, ctx->resampling_ctx->oheight) < 0) {
 
-            av_log(NULL, AV_LOG_ERROR, "pixel format conversion not handled\n");
+            av_log(ctx, AV_LOG_ERROR, "pixel format conversion not handled\n");
 
             res = -1;
             goto the_end;