comparison libswscale/utils.c @ 32329:597a570963fa

Set default values for the scale context in sws_alloc_context().
author stefano
date Wed, 29 Sep 2010 22:06:44 +0000
parents 9a91a876aab6
children 5572e926e027
comparison
equal deleted inserted replaced
32328:d13a73c5455c 32329:597a570963fa
41 #include "rgb2rgb.h" 41 #include "rgb2rgb.h"
42 #include "libavutil/intreadwrite.h" 42 #include "libavutil/intreadwrite.h"
43 #include "libavutil/x86_cpu.h" 43 #include "libavutil/x86_cpu.h"
44 #include "libavutil/avutil.h" 44 #include "libavutil/avutil.h"
45 #include "libavutil/bswap.h" 45 #include "libavutil/bswap.h"
46 #include "libavutil/opt.h"
46 #include "libavutil/pixdesc.h" 47 #include "libavutil/pixdesc.h"
47 48
48 unsigned swscale_version(void) 49 unsigned swscale_version(void)
49 { 50 {
50 return LIBSWSCALE_VERSION_INT; 51 return LIBSWSCALE_VERSION_INT;
744 SwsContext *sws_alloc_context(void) 745 SwsContext *sws_alloc_context(void)
745 { 746 {
746 SwsContext *c= av_mallocz(sizeof(SwsContext)); 747 SwsContext *c= av_mallocz(sizeof(SwsContext));
747 748
748 c->av_class = &sws_context_class; 749 c->av_class = &sws_context_class;
750 av_opt_set_defaults(c);
749 751
750 return c; 752 return c;
751 } 753 }
752 754
753 int sws_init_context(SwsContext *c, SwsFilter *srcFilter, SwsFilter *dstFilter) 755 int sws_init_context(SwsContext *c, SwsFilter *srcFilter, SwsFilter *dstFilter)
1152 c->dstFormat= dstFormat; 1154 c->dstFormat= dstFormat;
1153 1155
1154 if (param) { 1156 if (param) {
1155 c->param[0] = param[0]; 1157 c->param[0] = param[0];
1156 c->param[1] = param[1]; 1158 c->param[1] = param[1];
1157 } else {
1158 c->param[0] =
1159 c->param[1] = SWS_PARAM_DEFAULT;
1160 } 1159 }
1161 sws_setColorspaceDetails(c, ff_yuv2rgb_coeffs[SWS_CS_DEFAULT], c->srcRange, ff_yuv2rgb_coeffs[SWS_CS_DEFAULT] /* FIXME*/, c->dstRange, 0, 1<<16, 1<<16); 1160 sws_setColorspaceDetails(c, ff_yuv2rgb_coeffs[SWS_CS_DEFAULT], c->srcRange, ff_yuv2rgb_coeffs[SWS_CS_DEFAULT] /* FIXME*/, c->dstRange, 0, 1<<16, 1<<16);
1162 1161
1163 if(sws_init_context(c, srcFilter, dstFilter) < 0){ 1162 if(sws_init_context(c, srcFilter, dstFilter) < 0){
1164 sws_freeContext(c); 1163 sws_freeContext(c);