Mercurial > mplayer.hg
changeset 26175:b62cfba8df31
Remove redundant swScaler: output from places where av_log()
properly prints the context anyway.
| author | diego |
|---|---|
| date | Mon, 10 Mar 2008 07:30:24 +0000 |
| parents | 3f5039b63e4b |
| children | 303dfa60a7b8 |
| files | libswscale/swscale.c |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libswscale/swscale.c Sun Mar 09 18:49:31 2008 +0000 +++ b/libswscale/swscale.c Mon Mar 10 07:30:24 2008 +0000 @@ -1649,7 +1649,7 @@ case 0x83: conv= rgb15to32; break; case 0x84: conv= rgb16to32; break; case 0x86: conv= rgb24to32; break; - default: av_log(c, AV_LOG_ERROR, "swScaler: internal error %s -> %s converter\n", + default: av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n", sws_format_name(srcFormat), sws_format_name(dstFormat)); break; } }else if ( (isBGR(srcFormat) && isRGB(dstFormat)) @@ -1671,11 +1671,11 @@ case 0x84: conv= rgb16tobgr32; break; case 0x86: conv= rgb24tobgr32; break; case 0x88: conv= rgb32tobgr32; break; - default: av_log(c, AV_LOG_ERROR, "swScaler: internal error %s -> %s converter\n", + default: av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n", sws_format_name(srcFormat), sws_format_name(dstFormat)); break; } }else{ - av_log(c, AV_LOG_ERROR, "swScaler: internal error %s -> %s converter\n", + av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n", sws_format_name(srcFormat), sws_format_name(dstFormat)); } @@ -2536,7 +2536,7 @@ uint8_t* src2[4]= {src[0], src[1], src[2]}; uint32_t pal[256]; if (c->sliceDir == 0 && srcSliceY != 0 && srcSliceY + srcSliceH != c->srcH) { - av_log(c, AV_LOG_ERROR, "swScaler: slices start in the middle!\n"); + av_log(c, AV_LOG_ERROR, "Slices start in the middle!\n"); return 0; } if (c->sliceDir == 0) {