summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2011-04-26 00:27:48 +0200
committerDiego Biurrun <diego@biurrun.de>2011-06-15 13:20:20 +0200
commit3636e791ec295dcea3c1ce0206d944cd5c76a650 (patch)
tree8d228e3814745a26bb5842146af8e85f47bcfce7
parenta60466dbc3aededb0a1fab96d7fe2286f4c1a8f7 (diff)
downloadffmpeg-3636e791ec295dcea3c1ce0206d944cd5c76a650.tar.gz
swscale: use SwsContext for av_log when available
Signed-off-by: Diego Biurrun <diego@biurrun.de>
-rw-r--r--libswscale/utils.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 213bf3a043..d048b22e24 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -787,11 +787,11 @@ int sws_init_context(SwsContext *c, SwsFilter *srcFilter, SwsFilter *dstFilter)
unscaled = (srcW == dstW && srcH == dstH);
if (!isSupportedIn(srcFormat)) {
- av_log(NULL, AV_LOG_ERROR, "swScaler: %s is not supported as input pixel format\n", sws_format_name(srcFormat));
+ av_log(c, AV_LOG_ERROR, "%s is not supported as input pixel format\n", sws_format_name(srcFormat));
return AVERROR(EINVAL);
}
if (!isSupportedOut(dstFormat)) {
- av_log(NULL, AV_LOG_ERROR, "swScaler: %s is not supported as output pixel format\n", sws_format_name(dstFormat));
+ av_log(c, AV_LOG_ERROR, "%s is not supported as output pixel format\n", sws_format_name(dstFormat));
return AVERROR(EINVAL);
}
@@ -807,12 +807,12 @@ int sws_init_context(SwsContext *c, SwsFilter *srcFilter, SwsFilter *dstFilter)
|SWS_SPLINE
|SWS_BICUBLIN);
if(!i || (i & (i-1))) {
- av_log(NULL, AV_LOG_ERROR, "swScaler: Exactly one scaler algorithm must be chosen\n");
+ av_log(c, AV_LOG_ERROR, "Exactly one scaler algorithm must be chosen\n");
return AVERROR(EINVAL);
}
/* sanity check */
if (srcW<4 || srcH<1 || dstW<8 || dstH<1) { //FIXME check if these are enough and try to lowwer them after fixing the relevant parts of the code
- av_log(NULL, AV_LOG_ERROR, "swScaler: %dx%d -> %dx%d is invalid scaling dimension\n",
+ av_log(c, AV_LOG_ERROR, "%dx%d -> %dx%d is invalid scaling dimension\n",
srcW, srcH, dstW, dstH);
return AVERROR(EINVAL);
}