Browse code

Set default values for the scale context in sws_alloc_context().

Originally committed as revision 32415 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

Stefano Sabatini authored on 2010/09/30 07:06:44
Showing 1 changed files
... ...
@@ -43,6 +43,7 @@
43 43
 #include "libavutil/x86_cpu.h"
44 44
 #include "libavutil/avutil.h"
45 45
 #include "libavutil/bswap.h"
46
+#include "libavutil/opt.h"
46 47
 #include "libavutil/pixdesc.h"
47 48
 
48 49
 unsigned swscale_version(void)
... ...
@@ -746,6 +747,7 @@ SwsContext *sws_alloc_context(void)
746 746
     SwsContext *c= av_mallocz(sizeof(SwsContext));
747 747
 
748 748
     c->av_class = &sws_context_class;
749
+    av_opt_set_defaults(c);
749 750
 
750 751
     return c;
751 752
 }
... ...
@@ -1154,9 +1156,6 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat,
1154 1154
     if (param) {
1155 1155
         c->param[0] = param[0];
1156 1156
         c->param[1] = param[1];
1157
-    } else {
1158
-        c->param[0] =
1159
-        c->param[1] = SWS_PARAM_DEFAULT;
1160 1157
     }
1161 1158
     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 1159