*/
#include "avcodec.h"
-#include "swscale.h"
#include "dsputil.h"
+#include "libswscale/swscale.h"
#ifdef HAVE_ALTIVEC
#include "ppc/imgresample_altivec.h"
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;
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,
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 {
&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;
}
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;