[SCM] libav/experimental: Set valid default values for the srcw, srch, dstw, dsth options in the scale context. Prevent pointless warnings when using av_opt_set_defaults() for setting the default values, as in a pending patch.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 6d21d67b38af75cc4fe901a92f3a0ae114ed1e33
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Wed Sep 29 22:06:36 2010 +0000

    Set valid default values for the srcw, srch, dstw, dsth options in the
    scale context. Prevent pointless warnings when using
    av_opt_set_defaults() for setting the default values, as in a pending
    patch.
    
    Originally committed as revision 32413 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

diff --git a/libswscale/options.c b/libswscale/options.c
index c23a0ef..e80a075 100644
--- a/libswscale/options.c
+++ b/libswscale/options.c
@@ -58,10 +58,10 @@ static const AVOption options[] = {
     { "full_chroma_inp", "full chroma input", 0 , FF_OPT_TYPE_CONST, SWS_FULL_CHR_H_INP, INT_MIN, INT_MAX, VE, "sws_flags" },
     { "bitexact", "", 0 , FF_OPT_TYPE_CONST, SWS_BITEXACT, INT_MIN, INT_MAX, VE, "sws_flags" },
 
-    { "srcw", "source width"      , OFFSET(srcW), FF_OPT_TYPE_INT, DEFAULT, 1, INT_MAX, VE },
-    { "srch", "source height"     , OFFSET(srcH), FF_OPT_TYPE_INT, DEFAULT, 1, INT_MAX, VE },
-    { "dstw", "destination width" , OFFSET(dstW), FF_OPT_TYPE_INT, DEFAULT, 1, INT_MAX, VE },
-    { "dsth", "destination height", OFFSET(dstH), FF_OPT_TYPE_INT, DEFAULT, 1, INT_MAX, VE },
+    { "srcw", "source width"      , OFFSET(srcW), FF_OPT_TYPE_INT, 16, 1, INT_MAX, VE },
+    { "srch", "source height"     , OFFSET(srcH), FF_OPT_TYPE_INT, 16, 1, INT_MAX, VE },
+    { "dstw", "destination width" , OFFSET(dstW), FF_OPT_TYPE_INT, 16, 1, INT_MAX, VE },
+    { "dsth", "destination height", OFFSET(dstH), FF_OPT_TYPE_INT, 16, 1, INT_MAX, VE },
     { "src_format", "source format"     , OFFSET(srcFormat), FF_OPT_TYPE_INT, DEFAULT, 0, PIX_FMT_NB-1, VE },
     { "dst_format", "destination format", OFFSET(dstFormat), FF_OPT_TYPE_INT, DEFAULT, 0, PIX_FMT_NB-1, VE },
     { "src_range" , "source range"      , OFFSET(srcRange) , FF_OPT_TYPE_INT, DEFAULT, 0, 1, VE },

-- 
Libav/FFmpeg packaging