updated ffmpeg to 3.3, 11 3rd party libs, svg tmpl file

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 0f2e2323106a1960816e6eaa6082abb1766dd2e7..99975baea917810f70d88683ce756bf88a1e2ca4 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -131,12 +131,12 @@ PKG_3RD([faad2],[auto],
   [ include ])
 
 PKG_3RD([fdk],[auto],
-  [fdk-aac-0.1.4],
+  [fdk-aac-0.1.5],
   [ .libs/libfdk-aac.a ],
   [ libAACdec/include libAACenc/include libSYS/include ])
 
 PKG_3RD([ffmpeg],[yes],
-  [ffmpeg-3.1.4],
+  [ffmpeg-3.3],
   [ libavutil/libavutil.a \
     libavcodec/libavcodec.a \
     libpostproc/libpostproc.a \
@@ -148,7 +148,7 @@ PKG_3RD([ffmpeg],[yes],
   [ . ])
 
 PKG_3RD([fftw],[auto],
-  [fftw-3.3.4],
+  [fftw-3.3.6-pl2],
   [ .libs/libfftw3.a \
     libbench2/libbench2.a \
     rdft/scalar/r2cb/.libs/librdft_scalar_r2cb.a \
@@ -167,7 +167,7 @@ PKG_3RD([fftw],[auto],
   [ api ])
 
 PKG_3RD([flac],[auto],
-  [flac-1.3.1],
+  [flac-1.3.2],
   [ src/libFLAC/.libs/libFLAC.a \
     src/libFLAC++/.libs/libFLAC++.a \
     src/share/replaygain_analysis/.libs/libreplaygain_analysis.a \
@@ -178,7 +178,7 @@ PKG_3RD([flac],[auto],
   [ include ])
 
 PKG_3RD([giflib],[yes],
-  [giflib-5.1.2],
+  [giflib-5.1.4],
   [ lib/.libs/libgif.a \
     util/libgetarg.a ],
   [ lib ])
@@ -208,7 +208,7 @@ PKG_3RD([libavc1394],[auto],
   [ . ])
 
 PKG_3RD([libraw1394],[auto],
-  [libraw1394-2.0.5],
+  [libraw1394-2.1.2],
   [ src/.libs/libraw1394.a ],
   [ . ])
 
@@ -223,7 +223,7 @@ PKG_3RD([libdv],[auto],
   [ . ])
 
 PKG_3RD([libjpeg],[auto],
-  [libjpeg-turbo-1.4.0],
+  [libjpeg-turbo-1.5.1],
   [ .libs/libjpeg.a \
     .libs/libturbojpeg.a \
     simd/.libs/libsimd.a ],
@@ -240,7 +240,7 @@ PKG_3RD([libogg],[auto],
   [ include ])
 
 PKG_3RD([libsndfile],[auto],
-  [libsndfile-1.0.26],
+  [libsndfile-1.0.28],
   [ src/.libs/libsndfile.a \
     src/.libs/libcommon.a \
     src/G72x/.libs/libg72x.a \
@@ -293,7 +293,7 @@ PKG_3RD([openexr],[auto],
 #  [])
 #
 PKG_3RD([tiff],[auto],
-  [tiff-3.8.2],
+  [tiff-4.0.6],
   [ libtiff/.libs/libtiff.a \
     libtiff/.libs/libtiffxx.a \
     port/.libs/libport.a ],[
@@ -305,17 +305,17 @@ PKG_3RD([twolame],[auto],
   [  libtwolame ])
 
 PKG_3RD([x264],[auto],
-  [x264-snapshot-20160220-2245-stable],
+  [x264-snapshot-20170416-2245-stable],
   [ libx264.a ],
   [ . ])
 
 PKG_3RD([x265],[auto],
-  [x265_2.1],
+  [x265_2.3],
   [ libx265.a ],
   [ . source ])
 
 PKG_3RD([libvpx],[auto],
-  [libvpx-1.5.0],
+  [libvpx-1.6.1],
   [ libvpx.a ],
   [ . ])
 

diff --git a/cinelerra-5.1/ffmpeg/plugin.opts b/cinelerra-5.1/ffmpeg/plugin.opts
index f24dccd88a7da907db98ecfe7c7c480a9d209755..28af310a9f546c6861a132cdc90baf9192f31db4 100644 (file)
--- a/cinelerra-5.1/ffmpeg/plugin.opts
+++ b/cinelerra-5.1/ffmpeg/plugin.opts
@@ -181,3 +181,14 @@ vflip
 #ahistogram
 #showspectrumpic
 #spectrumsynth
+#asidedata
+#hysteresis
+#lut2
+#maskedclamp
+#midequalizer
+#premultiply
+#sidedata
+#signature
+#threshold
+#abitscope
+#hwupload_cuda

diff --git a/cinelerra-5.1/plugins/svg/empty_svg.h b/cinelerra-5.1/plugins/svg/empty_svg.h
index 6ef2f45534201f0c73b79ea0214bf48e419df1cd..0db62c39648ab12a0d779c5f5bbda58dbd795405 100644 (file)
--- a/cinelerra-5.1/plugins/svg/empty_svg.h
+++ b/cinelerra-5.1/plugins/svg/empty_svg.h
@@ -3,190 +3,202 @@
 
 static unsigned char empty_svg[] =
 {
-       0x00, 0x00, 0x0b, 0x64,
-       0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31,
-       0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54,
-       0x46, 0x2d, 0x38, 0x22, 0x20, 0x73, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x6c, 0x6f, 0x6e, 0x65, 0x3d,
-       0x22, 0x6e, 0x6f, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x43, 0x72, 0x65, 0x61,
-       0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x53, 0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64,
-       0x69, 0x20, 0x28, 0x22, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x73,
-       0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x22, 0x29, 0x20, 0x2d,
-       0x2d, 0x3e, 0x0a, 0x0a, 0x3c, 0x73, 0x76, 0x67, 0x0a, 0x20, 0x20, 0x20, 0x78, 0x6d, 0x6c, 0x6e,
-       0x73, 0x3a, 0x64, 0x63, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x70, 0x75, 0x72,
-       0x6c, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x64, 0x63, 0x2f, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74,
-       0x73, 0x2f, 0x31, 0x2e, 0x31, 0x2f, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73,
-       0x3a, 0x63, 0x63, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x63, 0x72, 0x65, 0x61,
-       0x74, 0x69, 0x76, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x73, 0x2e, 0x6f, 0x72, 0x67, 0x2f,
-       0x6e, 0x73, 0x23, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3a, 0x72, 0x64,
-       0x66, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33,
-       0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x31, 0x39, 0x39, 0x39, 0x2f, 0x30, 0x32, 0x2f, 0x32, 0x32, 0x2d,
-       0x72, 0x64, 0x66, 0x2d, 0x73, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x2d, 0x6e, 0x73, 0x23, 0x22, 0x0a,
-       0x20, 0x20, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3a, 0x73, 0x76, 0x67, 0x3d, 0x22, 0x68, 0x74,
-       0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f,
-       0x32, 0x30, 0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x78, 0x6d, 0x6c,
-       0x6e, 0x73, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77,
-       0x33, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30, 0x30, 0x30, 0x2f, 0x73, 0x76, 0x67, 0x22, 0x0a,
-       0x20, 0x20, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3a, 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64,
-       0x69, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f,
-       0x64, 0x69, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x66, 0x6f, 0x72, 0x67, 0x65, 0x2e, 0x6e,
-       0x65, 0x74, 0x2f, 0x44, 0x54, 0x44, 0x2f, 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64, 0x69, 0x2d,
-       0x30, 0x2e, 0x64, 0x74, 0x64, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3a,
-       0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f,
-       0x2f, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72,
-       0x67, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x69, 0x6e, 0x6b,
-       0x73, 0x63, 0x61, 0x70, 0x65, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x76,
-       0x67, 0x31, 0x30, 0x31, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64,
-       0x69, 0x3a, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x30, 0x2e, 0x33, 0x31, 0x22,
-       0x0a, 0x20, 0x20, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x33, 0x32, 0x30, 0x6d, 0x6d,
-       0x22, 0x0a, 0x20, 0x20, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x32, 0x30, 0x30,
-       0x6d, 0x6d, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64, 0x69, 0x3a,
-       0x64, 0x6f, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x75, 0x70, 0x73, 0x35, 0x2e, 0x73,
-       0x76, 0x67, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22,
-       0x31, 0x2e, 0x31, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65,
-       0x3a, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x38, 0x2e, 0x35,
-       0x20, 0x72, 0x31, 0x30, 0x30, 0x34, 0x30, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x6d, 0x65, 0x74,
-       0x61, 0x64, 0x61, 0x74, 0x61, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d,
-       0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x31, 0x38, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
-       0x3c, 0x72, 0x64, 0x66, 0x3a, 0x52, 0x44, 0x46, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-       0x3c, 0x63, 0x63, 0x3a, 0x57, 0x6f, 0x72, 0x6b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-       0x20, 0x20, 0x72, 0x64, 0x66, 0x3a, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x3d, 0x22, 0x22, 0x3e, 0x0a,
-       0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x64, 0x63, 0x3a, 0x66, 0x6f, 0x72, 0x6d,
-       0x61, 0x74, 0x3e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2f, 0x73, 0x76, 0x67, 0x2b, 0x78, 0x6d, 0x6c,
-       0x3c, 0x2f, 0x64, 0x63, 0x3a, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20,
-       0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x64, 0x63, 0x3a, 0x74, 0x79, 0x70, 0x65, 0x0a, 0x20, 0x20,
-       0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x64, 0x66, 0x3a, 0x72, 0x65, 0x73,
-       0x6f, 0x75, 0x72, 0x63, 0x65, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x70, 0x75,
-       0x72, 0x6c, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x64, 0x63, 0x2f, 0x64, 0x63, 0x6d, 0x69, 0x74, 0x79,
-       0x70, 0x65, 0x2f, 0x53, 0x74, 0x69, 0x6c, 0x6c, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 0x2f,
-       0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x63, 0x63, 0x3a, 0x57, 0x6f, 0x72,
-       0x6b, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x72, 0x64, 0x66, 0x3a, 0x52, 0x44, 0x46,
-       0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x3e, 0x0a,
-       0x20, 0x20, 0x3c, 0x64, 0x65, 0x66, 0x73, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x64, 0x3d,
-       0x22, 0x64, 0x65, 0x66, 0x73, 0x31, 0x30, 0x33, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c,
-       0x64, 0x65, 0x66, 0x73, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x64, 0x3d, 0x22,
-       0x64, 0x65, 0x66, 0x73, 0x31, 0x30, 0x37, 0x22, 0x20, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20,
-       0x3c, 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64, 0x69, 0x3a, 0x6e, 0x61, 0x6d, 0x65, 0x64, 0x76,
-       0x69, 0x65, 0x77, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6e,
-       0x61, 0x6d, 0x65, 0x64, 0x76, 0x69, 0x65, 0x77, 0x31, 0x34, 0x39, 0x22, 0x20, 0x2f, 0x3e, 0x0a,
-       0x20, 0x20, 0x3c, 0x2f, 0x64, 0x65, 0x66, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x73, 0x6f, 0x64,
-       0x69, 0x70, 0x6f, 0x64, 0x69, 0x3a, 0x6e, 0x61, 0x6d, 0x65, 0x64, 0x76, 0x69, 0x65, 0x77, 0x0a,
-       0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x61, 0x73, 0x65, 0x22, 0x0a, 0x20,
-       0x20, 0x20, 0x20, 0x20, 0x73, 0x68, 0x6f, 0x77, 0x67, 0x72, 0x69, 0x64, 0x3d, 0x22, 0x66, 0x61,
-       0x6c, 0x73, 0x65, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61,
-       0x70, 0x65, 0x3a, 0x7a, 0x6f, 0x6f, 0x6d, 0x3d, 0x22, 0x30, 0x2e, 0x32, 0x36, 0x37, 0x32, 0x32,
-       0x39, 0x31, 0x36, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61,
-       0x70, 0x65, 0x3a, 0x63, 0x78, 0x3d, 0x22, 0x35, 0x36, 0x36, 0x2e, 0x39, 0x32, 0x39, 0x31, 0x33,
-       0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a,
-       0x63, 0x79, 0x3d, 0x22, 0x33, 0x33, 0x39, 0x2e, 0x33, 0x36, 0x32, 0x32, 0x39, 0x22, 0x0a, 0x20,
-       0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, 0x77, 0x69, 0x6e,
-       0x64, 0x6f, 0x77, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x35, 0x30, 0x31, 0x22, 0x0a,
-       0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, 0x77, 0x69,
-       0x6e, 0x64, 0x6f, 0x77, 0x2d, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3d, 0x22, 0x36, 0x30, 0x39,
-       0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a,
-       0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2d, 0x78, 0x3d, 0x22, 0x38, 0x34, 0x22, 0x0a, 0x20, 0x20,
-       0x20, 0x20, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, 0x77, 0x69, 0x6e, 0x64,
-       0x6f, 0x77, 0x2d, 0x79, 0x3d, 0x22, 0x33, 0x30, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69,
-       0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2d, 0x6d,
-       0x61, 0x78, 0x69, 0x6d, 0x69, 0x7a, 0x65, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x0a, 0x20, 0x20, 0x20,
-       0x20, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, 0x63, 0x75, 0x72, 0x72, 0x65,
-       0x6e, 0x74, 0x2d, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x3d, 0x22, 0x73, 0x76, 0x67, 0x31, 0x30, 0x31,
-       0x22, 0x20, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x70, 0x6f, 0x6c, 0x79, 0x67, 0x6f, 0x6e, 0x0a,
-       0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64, 0x69, 0x3a, 0x74, 0x79,
-       0x70, 0x65, 0x3d, 0x22, 0x73, 0x74, 0x61, 0x72, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73,
-       0x74, 0x79, 0x6c, 0x65, 0x3d, 0x22, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x3a,
-       0x31, 0x32, 0x70, 0x78, 0x3b, 0x66, 0x69, 0x6c, 0x6c, 0x3a, 0x23, 0x38, 0x30, 0x38, 0x30, 0x38,
-       0x30, 0x3b, 0x66, 0x69, 0x6c, 0x6c, 0x2d, 0x72, 0x75, 0x6c, 0x65, 0x3a, 0x65, 0x76, 0x65, 0x6e,
-       0x6f, 0x64, 0x64, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68,
-       0x3a, 0x31, 0x70, 0x74, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70,
-       0x6f, 0x6c, 0x79, 0x67, 0x6f, 0x6e, 0x31, 0x36, 0x32, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-       0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64, 0x69, 0x3a, 0x73, 0x69, 0x64, 0x65, 0x73, 0x3d, 0x22,
-       0x35, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64, 0x69,
-       0x3a, 0x63, 0x78, 0x3d, 0x22, 0x37, 0x36, 0x38, 0x2e, 0x39, 0x30, 0x38, 0x36, 0x33, 0x22, 0x0a,
-       0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64, 0x69, 0x3a, 0x63, 0x79,
-       0x3d, 0x22, 0x35, 0x32, 0x39, 0x2e, 0x34, 0x36, 0x36, 0x35, 0x35, 0x22, 0x0a, 0x20, 0x20, 0x20,
-       0x20, 0x20, 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64, 0x69, 0x3a, 0x72, 0x31, 0x3d, 0x22, 0x39,
-       0x39, 0x2e, 0x32, 0x35, 0x31, 0x33, 0x35, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x6f,
-       0x64, 0x69, 0x70, 0x6f, 0x64, 0x69, 0x3a, 0x72, 0x32, 0x3d, 0x22, 0x34, 0x39, 0x2e, 0x36, 0x32,
-       0x35, 0x36, 0x37, 0x35, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x6f, 0x64, 0x69, 0x70,
-       0x6f, 0x64, 0x69, 0x3a, 0x61, 0x72, 0x67, 0x31, 0x3d, 0x22, 0x30, 0x2e, 0x34, 0x30, 0x34, 0x38,
-       0x39, 0x32, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64,
-       0x69, 0x3a, 0x61, 0x72, 0x67, 0x32, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x33, 0x33, 0x32, 0x31, 0x31,
-       0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x38,
-       0x36, 0x30, 0x2e, 0x31, 0x33, 0x35, 0x2c, 0x35, 0x36, 0x38, 0x2e, 0x35, 0x36, 0x34, 0x20, 0x37,
-       0x39, 0x34, 0x2e, 0x33, 0x32, 0x2c, 0x35, 0x37, 0x32, 0x2e, 0x30, 0x39, 0x32, 0x20, 0x37, 0x35,
-       0x39, 0x2e, 0x39, 0x31, 0x36, 0x2c, 0x36, 0x32, 0x38, 0x2e, 0x33, 0x31, 0x20, 0x37, 0x33, 0x36,
-       0x2e, 0x32, 0x32, 0x32, 0x2c, 0x35, 0x36, 0x36, 0x2e, 0x38, 0x30, 0x36, 0x20, 0x36, 0x37, 0x32,
-       0x2e, 0x31, 0x32, 0x34, 0x2c, 0x35, 0x35, 0x31, 0x2e, 0x34, 0x35, 0x38, 0x20, 0x37, 0x32, 0x33,
-       0x2e, 0x32, 0x39, 0x35, 0x2c, 0x35, 0x30, 0x39, 0x2e, 0x39, 0x31, 0x38, 0x20, 0x37, 0x31, 0x38,
-       0x2e, 0x30, 0x38, 0x36, 0x2c, 0x34, 0x34, 0x34, 0x2e, 0x32, 0x31, 0x35, 0x20, 0x37, 0x37, 0x33,
-       0x2e, 0x34, 0x30, 0x35, 0x2c, 0x34, 0x38, 0x30, 0x2e, 0x30, 0x34, 0x35, 0x20, 0x38, 0x33, 0x34,
-       0x2e, 0x32, 0x38, 0x33, 0x2c, 0x34, 0x35, 0x34, 0x2e, 0x37, 0x38, 0x37, 0x20, 0x38, 0x31, 0x37,
-       0x2e, 0x33, 0x30, 0x31, 0x2c, 0x35, 0x31, 0x38, 0x2e, 0x34, 0x37, 0x31, 0x20, 0x38, 0x36, 0x30,
-       0x2e, 0x31, 0x33, 0x35, 0x2c, 0x35, 0x36, 0x38, 0x2e, 0x35, 0x36, 0x34, 0x20, 0x22, 0x0a, 0x20,
-       0x20, 0x20, 0x20, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74,
-       0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x2d, 0x36, 0x31, 0x31, 0x2e, 0x33, 0x35,
-       0x37, 0x36, 0x39, 0x2c, 0x2d, 0x33, 0x39, 0x34, 0x2e, 0x32, 0x34, 0x33, 0x31, 0x36, 0x29, 0x22,
-       0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, 0x66,
-       0x6c, 0x61, 0x74, 0x73, 0x69, 0x64, 0x65, 0x64, 0x3d, 0x22, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x22,
-       0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, 0x72,
-       0x6f, 0x75, 0x6e, 0x64, 0x65, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-       0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x69,
-       0x7a, 0x65, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x64, 0x3d, 0x22,
-       0x6d, 0x20, 0x38, 0x36, 0x30, 0x2e, 0x31, 0x33, 0x35, 0x30, 0x31, 0x2c, 0x35, 0x36, 0x38, 0x2e,
-       0x35, 0x36, 0x33, 0x35, 0x39, 0x20, 0x2d, 0x36, 0x35, 0x2e, 0x38, 0x31, 0x34, 0x38, 0x39, 0x2c,
-       0x33, 0x2e, 0x35, 0x32, 0x38, 0x38, 0x32, 0x20, 0x2d, 0x33, 0x34, 0x2e, 0x34, 0x30, 0x34, 0x34,
-       0x39, 0x2c, 0x35, 0x36, 0x2e, 0x32, 0x31, 0x37, 0x32, 0x33, 0x20, 0x2d, 0x32, 0x33, 0x2e, 0x36,
-       0x39, 0x34, 0x30, 0x32, 0x2c, 0x2d, 0x36, 0x31, 0x2e, 0x35, 0x30, 0x33, 0x32, 0x31, 0x20, 0x2d,
-       0x36, 0x34, 0x2e, 0x30, 0x39, 0x37, 0x33, 0x33, 0x2c, 0x2d, 0x31, 0x35, 0x2e, 0x33, 0x34, 0x38,
-       0x35, 0x33, 0x20, 0x35, 0x31, 0x2e, 0x31, 0x37, 0x31, 0x31, 0x37, 0x2c, 0x2d, 0x34, 0x31, 0x2e,
-       0x35, 0x33, 0x39, 0x38, 0x39, 0x20, 0x2d, 0x35, 0x2e, 0x32, 0x30, 0x39, 0x38, 0x34, 0x2c, 0x2d,
-       0x36, 0x35, 0x2e, 0x37, 0x30, 0x33, 0x31, 0x35, 0x20, 0x35, 0x35, 0x2e, 0x33, 0x31, 0x39, 0x35,
-       0x34, 0x2c, 0x33, 0x35, 0x2e, 0x38, 0x33, 0x30, 0x31, 0x35, 0x20, 0x36, 0x30, 0x2e, 0x38, 0x37,
-       0x37, 0x34, 0x38, 0x2c, 0x2d, 0x32, 0x35, 0x2e, 0x32, 0x35, 0x38, 0x32, 0x35, 0x20, 0x2d, 0x31,
-       0x36, 0x2e, 0x39, 0x38, 0x31, 0x38, 0x32, 0x2c, 0x36, 0x33, 0x2e, 0x36, 0x38, 0x34, 0x31, 0x34,
-       0x20, 0x7a, 0x22, 0x20, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x74, 0x65, 0x78, 0x74, 0x0a, 0x20,
-       0x20, 0x20, 0x20, 0x20, 0x78, 0x6d, 0x6c, 0x3a, 0x73, 0x70, 0x61, 0x63, 0x65, 0x3d, 0x22, 0x70,
-       0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x74,
-       0x79, 0x6c, 0x65, 0x3d, 0x22, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x3a, 0x31,
-       0x34, 0x34, 0x70, 0x78, 0x3b, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3a,
-       0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x3b, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x76, 0x61, 0x72, 0x69,
-       0x61, 0x6e, 0x74, 0x3a, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x3b, 0x66, 0x6f, 0x6e, 0x74, 0x2d,
-       0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3a, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x3b, 0x66, 0x6f,
-       0x6e, 0x74, 0x2d, 0x73, 0x74, 0x72, 0x65, 0x74, 0x63, 0x68, 0x3a, 0x6e, 0x6f, 0x72, 0x6d, 0x61,
-       0x6c, 0x3b, 0x74, 0x65, 0x78, 0x74, 0x2d, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x3a, 0x73, 0x74, 0x61,
-       0x72, 0x74, 0x3b, 0x6c, 0x69, 0x6e, 0x65, 0x2d, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x3a, 0x31,
-       0x32, 0x35, 0x25, 0x3b, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x72, 0x2d, 0x73, 0x70, 0x61, 0x63, 0x69,
-       0x6e, 0x67, 0x3a, 0x30, 0x70, 0x78, 0x3b, 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x73, 0x70, 0x61, 0x63,
-       0x69, 0x6e, 0x67, 0x3a, 0x30, 0x70, 0x78, 0x3b, 0x77, 0x72, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x2d,
-       0x6d, 0x6f, 0x64, 0x65, 0x3a, 0x6c, 0x72, 0x2d, 0x74, 0x62, 0x3b, 0x74, 0x65, 0x78, 0x74, 0x2d,
-       0x61, 0x6e, 0x63, 0x68, 0x6f, 0x72, 0x3a, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3b, 0x66, 0x69, 0x6c,
-       0x6c, 0x3a, 0x23, 0x66, 0x66, 0x34, 0x35, 0x30, 0x30, 0x3b, 0x66, 0x69, 0x6c, 0x6c, 0x2d, 0x6f,
-       0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3a,
-       0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x66, 0x61, 0x6d, 0x69, 0x6c, 0x79,
-       0x3a, 0x53, 0x61, 0x6e, 0x73, 0x3b, 0x2d, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x2d,
-       0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69,
-       0x6f, 0x6e, 0x3a, 0x53, 0x61, 0x6e, 0x73, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x78, 0x3d,
-       0x22, 0x32, 0x39, 0x39, 0x2e, 0x33, 0x36, 0x38, 0x35, 0x33, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20,
-       0x20, 0x79, 0x3d, 0x22, 0x33, 0x32, 0x36, 0x2e, 0x39, 0x36, 0x36, 0x35, 0x35, 0x22, 0x0a, 0x20,
-       0x20, 0x20, 0x20, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x32, 0x39, 0x39, 0x34,
-       0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64, 0x69, 0x3a,
-       0x6c, 0x69, 0x6e, 0x65, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x31, 0x32, 0x35,
-       0x25, 0x22, 0x3e, 0x3c, 0x74, 0x73, 0x70, 0x61, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-       0x20, 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64, 0x69, 0x3a, 0x72, 0x6f, 0x6c, 0x65, 0x3d, 0x22,
-       0x6c, 0x69, 0x6e, 0x65, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x64, 0x3d,
-       0x22, 0x74, 0x73, 0x70, 0x61, 0x6e, 0x32, 0x39, 0x39, 0x38, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20,
-       0x20, 0x20, 0x20, 0x78, 0x3d, 0x22, 0x32, 0x39, 0x39, 0x2e, 0x33, 0x36, 0x38, 0x35, 0x33, 0x22,
-       0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x79, 0x3d, 0x22, 0x33, 0x32, 0x36, 0x2e, 0x39,
-       0x36, 0x36, 0x35, 0x35, 0x22, 0x3e, 0x6e, 0x65, 0x77, 0x3c, 0x2f, 0x74, 0x73, 0x70, 0x61, 0x6e,
-       0x3e, 0x3c, 0x74, 0x73, 0x70, 0x61, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73,
-       0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64, 0x69, 0x3a, 0x72, 0x6f, 0x6c, 0x65, 0x3d, 0x22, 0x6c, 0x69,
-       0x6e, 0x65, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x78, 0x3d, 0x22, 0x32, 0x39,
-       0x39, 0x2e, 0x33, 0x36, 0x38, 0x35, 0x33, 0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-       0x79, 0x3d, 0x22, 0x35, 0x30, 0x36, 0x2e, 0x39, 0x36, 0x36, 0x35, 0x35, 0x22, 0x0a, 0x20, 0x20,
-       0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x73, 0x70, 0x61, 0x6e, 0x33, 0x30,
-       0x30, 0x30, 0x22, 0x3e, 0x20, 0x73, 0x67, 0x76, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x3c, 0x2f, 0x74,
-       0x73, 0x70, 0x61, 0x6e, 0x3e, 0x3c, 0x2f, 0x74, 0x65, 0x78, 0x74, 0x3e, 0x0a, 0x3c, 0x2f, 0x73,
-       0x76, 0x67, 0x3e, 0x0a
+0x00,0x00,0x0c,0x27,
+0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x3d,0x22,0x31,
+0x2e,0x30,0x22,0x20,0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,0x55,0x54,
+0x46,0x2d,0x38,0x22,0x20,0x73,0x74,0x61,0x6e,0x64,0x61,0x6c,0x6f,0x6e,0x65,0x3d,
+0x22,0x6e,0x6f,0x22,0x3f,0x3e,0x0a,0x3c,0x21,0x2d,0x2d,0x20,0x43,0x72,0x65,0x61,
+0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x53,0x6f,0x64,0x69,0x70,0x6f,0x64,
+0x69,0x20,0x28,0x22,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77,0x77,0x77,0x2e,0x73,
+0x6f,0x64,0x69,0x70,0x6f,0x64,0x69,0x2e,0x63,0x6f,0x6d,0x2f,0x22,0x29,0x20,0x2d,
+0x2d,0x3e,0x0a,0x0a,0x3c,0x73,0x76,0x67,0x0a,0x20,0x20,0x20,0x78,0x6d,0x6c,0x6e,
+0x73,0x3a,0x64,0x63,0x3d,0x22,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x70,0x75,0x72,
+0x6c,0x2e,0x6f,0x72,0x67,0x2f,0x64,0x63,0x2f,0x65,0x6c,0x65,0x6d,0x65,0x6e,0x74,
+0x73,0x2f,0x31,0x2e,0x31,0x2f,0x22,0x0a,0x20,0x20,0x20,0x78,0x6d,0x6c,0x6e,0x73,
+0x3a,0x63,0x63,0x3d,0x22,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x63,0x72,0x65,0x61,
+0x74,0x69,0x76,0x65,0x63,0x6f,0x6d,0x6d,0x6f,0x6e,0x73,0x2e,0x6f,0x72,0x67,0x2f,
+0x6e,0x73,0x23,0x22,0x0a,0x20,0x20,0x20,0x78,0x6d,0x6c,0x6e,0x73,0x3a,0x72,0x64,
+0x66,0x3d,0x22,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77,0x77,0x77,0x2e,0x77,0x33,
+0x2e,0x6f,0x72,0x67,0x2f,0x31,0x39,0x39,0x39,0x2f,0x30,0x32,0x2f,0x32,0x32,0x2d,
+0x72,0x64,0x66,0x2d,0x73,0x79,0x6e,0x74,0x61,0x78,0x2d,0x6e,0x73,0x23,0x22,0x0a,
+0x20,0x20,0x20,0x78,0x6d,0x6c,0x6e,0x73,0x3a,0x73,0x76,0x67,0x3d,0x22,0x68,0x74,
+0x74,0x70,0x3a,0x2f,0x2f,0x77,0x77,0x77,0x2e,0x77,0x33,0x2e,0x6f,0x72,0x67,0x2f,
+0x32,0x30,0x30,0x30,0x2f,0x73,0x76,0x67,0x22,0x0a,0x20,0x20,0x20,0x78,0x6d,0x6c,
+0x6e,0x73,0x3d,0x22,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77,0x77,0x77,0x2e,0x77,
+0x33,0x2e,0x6f,0x72,0x67,0x2f,0x32,0x30,0x30,0x30,0x2f,0x73,0x76,0x67,0x22,0x0a,
+0x20,0x20,0x20,0x78,0x6d,0x6c,0x6e,0x73,0x3a,0x73,0x6f,0x64,0x69,0x70,0x6f,0x64,
+0x69,0x3d,0x22,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x73,0x6f,0x64,0x69,0x70,0x6f,
+0x64,0x69,0x2e,0x73,0x6f,0x75,0x72,0x63,0x65,0x66,0x6f,0x72,0x67,0x65,0x2e,0x6e,
+0x65,0x74,0x2f,0x44,0x54,0x44,0x2f,0x73,0x6f,0x64,0x69,0x70,0x6f,0x64,0x69,0x2d,
+0x30,0x2e,0x64,0x74,0x64,0x22,0x0a,0x20,0x20,0x20,0x78,0x6d,0x6c,0x6e,0x73,0x3a,
+0x69,0x6e,0x6b,0x73,0x63,0x61,0x70,0x65,0x3d,0x22,0x68,0x74,0x74,0x70,0x3a,0x2f,
+0x2f,0x77,0x77,0x77,0x2e,0x69,0x6e,0x6b,0x73,0x63,0x61,0x70,0x65,0x2e,0x6f,0x72,
+0x67,0x2f,0x6e,0x61,0x6d,0x65,0x73,0x70,0x61,0x63,0x65,0x73,0x2f,0x69,0x6e,0x6b,
+0x73,0x63,0x61,0x70,0x65,0x22,0x0a,0x20,0x20,0x20,0x69,0x64,0x3d,0x22,0x73,0x76,
+0x67,0x31,0x30,0x31,0x22,0x0a,0x20,0x20,0x20,0x73,0x6f,0x64,0x69,0x70,0x6f,0x64,
+0x69,0x3a,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x3d,0x22,0x30,0x2e,0x33,0x31,0x22,
+0x0a,0x20,0x20,0x20,0x77,0x69,0x64,0x74,0x68,0x3d,0x22,0x33,0x32,0x30,0x6d,0x6d,
+0x22,0x0a,0x20,0x20,0x20,0x68,0x65,0x69,0x67,0x68,0x74,0x3d,0x22,0x32,0x30,0x30,
+0x6d,0x6d,0x22,0x0a,0x20,0x20,0x20,0x73,0x6f,0x64,0x69,0x70,0x6f,0x64,0x69,0x3a,
+0x64,0x6f,0x63,0x6e,0x61,0x6d,0x65,0x3d,0x22,0x78,0x78,0x2e,0x73,0x76,0x67,0x22,
+0x0a,0x20,0x20,0x20,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x31,
+0x22,0x0a,0x20,0x20,0x20,0x69,0x6e,0x6b,0x73,0x63,0x61,0x70,0x65,0x3a,0x76,0x65,
+0x72,0x73,0x69,0x6f,0x6e,0x3d,0x22,0x30,0x2e,0x39,0x32,0x2e,0x31,0x20,0x72,0x22,
+0x3e,0x0a,0x20,0x20,0x3c,0x6d,0x65,0x74,0x61,0x64,0x61,0x74,0x61,0x0a,0x20,0x20,
+0x20,0x20,0x20,0x69,0x64,0x3d,0x22,0x6d,0x65,0x74,0x61,0x64,0x61,0x74,0x61,0x31,
+0x38,0x22,0x3e,0x0a,0x20,0x20,0x20,0x20,0x3c,0x72,0x64,0x66,0x3a,0x52,0x44,0x46,
+0x3e,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x3c,0x63,0x63,0x3a,0x57,0x6f,0x72,0x6b,
+0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x72,0x64,0x66,0x3a,0x61,0x62,
+0x6f,0x75,0x74,0x3d,0x22,0x22,0x3e,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+0x3c,0x64,0x63,0x3a,0x66,0x6f,0x72,0x6d,0x61,0x74,0x3e,0x69,0x6d,0x61,0x67,0x65,
+0x2f,0x73,0x76,0x67,0x2b,0x78,0x6d,0x6c,0x3c,0x2f,0x64,0x63,0x3a,0x66,0x6f,0x72,
+0x6d,0x61,0x74,0x3e,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x3c,0x64,0x63,
+0x3a,0x74,0x79,0x70,0x65,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+0x20,0x72,0x64,0x66,0x3a,0x72,0x65,0x73,0x6f,0x75,0x72,0x63,0x65,0x3d,0x22,0x68,
+0x74,0x74,0x70,0x3a,0x2f,0x2f,0x70,0x75,0x72,0x6c,0x2e,0x6f,0x72,0x67,0x2f,0x64,
+0x63,0x2f,0x64,0x63,0x6d,0x69,0x74,0x79,0x70,0x65,0x2f,0x53,0x74,0x69,0x6c,0x6c,
+0x49,0x6d,0x61,0x67,0x65,0x22,0x20,0x2f,0x3e,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,
+0x20,0x20,0x3c,0x64,0x63,0x3a,0x74,0x69,0x74,0x6c,0x65,0x3e,0x3c,0x2f,0x64,0x63,
+0x3a,0x74,0x69,0x74,0x6c,0x65,0x3e,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x3c,0x2f,
+0x63,0x63,0x3a,0x57,0x6f,0x72,0x6b,0x3e,0x0a,0x20,0x20,0x20,0x20,0x3c,0x2f,0x72,
+0x64,0x66,0x3a,0x52,0x44,0x46,0x3e,0x0a,0x20,0x20,0x3c,0x2f,0x6d,0x65,0x74,0x61,
+0x64,0x61,0x74,0x61,0x3e,0x0a,0x20,0x20,0x3c,0x64,0x65,0x66,0x73,0x0a,0x20,0x20,
+0x20,0x20,0x20,0x69,0x64,0x3d,0x22,0x64,0x65,0x66,0x73,0x31,0x30,0x33,0x22,0x3e,
+0x0a,0x20,0x20,0x20,0x20,0x3c,0x64,0x65,0x66,0x73,0x0a,0x20,0x20,0x20,0x20,0x20,
+0x20,0x20,0x69,0x64,0x3d,0x22,0x64,0x65,0x66,0x73,0x31,0x30,0x37,0x22,0x20,0x2f,
+0x3e,0x0a,0x20,0x20,0x20,0x20,0x3c,0x73,0x6f,0x64,0x69,0x70,0x6f,0x64,0x69,0x3a,
+0x6e,0x61,0x6d,0x65,0x64,0x76,0x69,0x65,0x77,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,
+0x20,0x69,0x64,0x3d,0x22,0x6e,0x61,0x6d,0x65,0x64,0x76,0x69,0x65,0x77,0x31,0x34,
+0x39,0x22,0x20,0x2f,0x3e,0x0a,0x20,0x20,0x3c,0x2f,0x64,0x65,0x66,0x73,0x3e,0x0a,
+0x20,0x20,0x3c,0x73,0x6f,0x64,0x69,0x70,0x6f,0x64,0x69,0x3a,0x6e,0x61,0x6d,0x65,
+0x64,0x76,0x69,0x65,0x77,0x0a,0x20,0x20,0x20,0x20,0x20,0x69,0x64,0x3d,0x22,0x62,
+0x61,0x73,0x65,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x73,0x68,0x6f,0x77,0x67,0x72,
+0x69,0x64,0x3d,0x22,0x66,0x61,0x6c,0x73,0x65,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,
+0x69,0x6e,0x6b,0x73,0x63,0x61,0x70,0x65,0x3a,0x7a,0x6f,0x6f,0x6d,0x3d,0x22,0x30,
+0x2e,0x32,0x36,0x37,0x32,0x32,0x39,0x31,0x36,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,
+0x69,0x6e,0x6b,0x73,0x63,0x61,0x70,0x65,0x3a,0x63,0x78,0x3d,0x22,0x35,0x36,0x36,
+0x2e,0x39,0x32,0x39,0x31,0x33,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x69,0x6e,0x6b,
+0x73,0x63,0x61,0x70,0x65,0x3a,0x63,0x79,0x3d,0x22,0x33,0x33,0x39,0x2e,0x33,0x36,
+0x32,0x32,0x39,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x69,0x6e,0x6b,0x73,0x63,0x61,
+0x70,0x65,0x3a,0x77,0x69,0x6e,0x64,0x6f,0x77,0x2d,0x77,0x69,0x64,0x74,0x68,0x3d,
+0x22,0x35,0x31,0x30,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x69,0x6e,0x6b,0x73,0x63,
+0x61,0x70,0x65,0x3a,0x77,0x69,0x6e,0x64,0x6f,0x77,0x2d,0x68,0x65,0x69,0x67,0x68,
+0x74,0x3d,0x22,0x36,0x30,0x39,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x69,0x6e,0x6b,
+0x73,0x63,0x61,0x70,0x65,0x3a,0x77,0x69,0x6e,0x64,0x6f,0x77,0x2d,0x78,0x3d,0x22,
+0x38,0x34,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x69,0x6e,0x6b,0x73,0x63,0x61,0x70,
+0x65,0x3a,0x77,0x69,0x6e,0x64,0x6f,0x77,0x2d,0x79,0x3d,0x22,0x33,0x30,0x22,0x0a,
+0x20,0x20,0x20,0x20,0x20,0x69,0x6e,0x6b,0x73,0x63,0x61,0x70,0x65,0x3a,0x77,0x69,
+0x6e,0x64,0x6f,0x77,0x2d,0x6d,0x61,0x78,0x69,0x6d,0x69,0x7a,0x65,0x64,0x3d,0x22,
+0x30,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x69,0x6e,0x6b,0x73,0x63,0x61,0x70,0x65,
+0x3a,0x63,0x75,0x72,0x72,0x65,0x6e,0x74,0x2d,0x6c,0x61,0x79,0x65,0x72,0x3d,0x22,
+0x73,0x76,0x67,0x31,0x30,0x31,0x22,0x20,0x2f,0x3e,0x0a,0x20,0x20,0x3c,0x70,0x6f,
+0x6c,0x79,0x67,0x6f,0x6e,0x0a,0x20,0x20,0x20,0x20,0x20,0x73,0x6f,0x64,0x69,0x70,
+0x6f,0x64,0x69,0x3a,0x74,0x79,0x70,0x65,0x3d,0x22,0x73,0x74,0x61,0x72,0x22,0x0a,
+0x20,0x20,0x20,0x20,0x20,0x73,0x74,0x79,0x6c,0x65,0x3d,0x22,0x66,0x6f,0x6e,0x74,
+0x2d,0x73,0x69,0x7a,0x65,0x3a,0x31,0x32,0x70,0x78,0x3b,0x66,0x69,0x6c,0x6c,0x3a,
+0x23,0x38,0x30,0x38,0x30,0x38,0x30,0x3b,0x66,0x69,0x6c,0x6c,0x2d,0x72,0x75,0x6c,
+0x65,0x3a,0x65,0x76,0x65,0x6e,0x6f,0x64,0x64,0x3b,0x73,0x74,0x72,0x6f,0x6b,0x65,
+0x2d,0x77,0x69,0x64,0x74,0x68,0x3a,0x31,0x2e,0x30,0x36,0x36,0x36,0x36,0x36,0x36,
+0x39,0x70,0x74,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x69,0x64,0x3d,0x22,0x70,0x6f,
+0x6c,0x79,0x67,0x6f,0x6e,0x31,0x36,0x32,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x73,
+0x6f,0x64,0x69,0x70,0x6f,0x64,0x69,0x3a,0x73,0x69,0x64,0x65,0x73,0x3d,0x22,0x35,
+0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x73,0x6f,0x64,0x69,0x70,0x6f,0x64,0x69,0x3a,
+0x63,0x78,0x3d,0x22,0x31,0x36,0x38,0x2e,0x30,0x35,0x34,0x33,0x34,0x22,0x0a,0x20,
+0x20,0x20,0x20,0x20,0x73,0x6f,0x64,0x69,0x70,0x6f,0x64,0x69,0x3a,0x63,0x79,0x3d,
+0x22,0x31,0x34,0x34,0x2e,0x32,0x33,0x38,0x33,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,
+0x73,0x6f,0x64,0x69,0x70,0x6f,0x64,0x69,0x3a,0x72,0x31,0x3d,0x22,0x31,0x30,0x35,
+0x2e,0x38,0x36,0x38,0x31,0x31,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x73,0x6f,0x64,
+0x69,0x70,0x6f,0x64,0x69,0x3a,0x72,0x32,0x3d,0x22,0x35,0x32,0x2e,0x39,0x33,0x34,
+0x30,0x35,0x35,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x73,0x6f,0x64,0x69,0x70,0x6f,
+0x64,0x69,0x3a,0x61,0x72,0x67,0x31,0x3d,0x22,0x30,0x2e,0x34,0x30,0x34,0x38,0x39,
+0x32,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x73,0x6f,0x64,0x69,0x70,0x6f,0x64,0x69,
+0x3a,0x61,0x72,0x67,0x32,0x3d,0x22,0x31,0x2e,0x30,0x33,0x33,0x32,0x31,0x31,0x22,
+0x0a,0x20,0x20,0x20,0x20,0x20,0x70,0x6f,0x69,0x6e,0x74,0x73,0x3d,0x22,0x38,0x36,
+0x30,0x2e,0x31,0x33,0x35,0x2c,0x35,0x36,0x38,0x2e,0x35,0x36,0x34,0x20,0x37,0x39,
+0x34,0x2e,0x33,0x32,0x2c,0x35,0x37,0x32,0x2e,0x30,0x39,0x32,0x20,0x37,0x35,0x39,
+0x2e,0x39,0x31,0x36,0x2c,0x36,0x32,0x38,0x2e,0x33,0x31,0x20,0x37,0x33,0x36,0x2e,
+0x32,0x32,0x32,0x2c,0x35,0x36,0x36,0x2e,0x38,0x30,0x36,0x20,0x36,0x37,0x32,0x2e,
+0x31,0x32,0x34,0x2c,0x35,0x35,0x31,0x2e,0x34,0x35,0x38,0x20,0x37,0x32,0x33,0x2e,
+0x32,0x39,0x35,0x2c,0x35,0x30,0x39,0x2e,0x39,0x31,0x38,0x20,0x37,0x31,0x38,0x2e,
+0x30,0x38,0x36,0x2c,0x34,0x34,0x34,0x2e,0x32,0x31,0x35,0x20,0x37,0x37,0x33,0x2e,
+0x34,0x30,0x35,0x2c,0x34,0x38,0x30,0x2e,0x30,0x34,0x35,0x20,0x38,0x33,0x34,0x2e,
+0x32,0x38,0x33,0x2c,0x34,0x35,0x34,0x2e,0x37,0x38,0x37,0x20,0x38,0x31,0x37,0x2e,
+0x33,0x30,0x31,0x2c,0x35,0x31,0x38,0x2e,0x34,0x37,0x31,0x20,0x38,0x36,0x30,0x2e,
+0x31,0x33,0x35,0x2c,0x35,0x36,0x38,0x2e,0x35,0x36,0x34,0x20,0x22,0x0a,0x20,0x20,
+0x20,0x20,0x20,0x69,0x6e,0x6b,0x73,0x63,0x61,0x70,0x65,0x3a,0x66,0x6c,0x61,0x74,
+0x73,0x69,0x64,0x65,0x64,0x3d,0x22,0x66,0x61,0x6c,0x73,0x65,0x22,0x0a,0x20,0x20,
+0x20,0x20,0x20,0x69,0x6e,0x6b,0x73,0x63,0x61,0x70,0x65,0x3a,0x72,0x6f,0x75,0x6e,
+0x64,0x65,0x64,0x3d,0x22,0x30,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x69,0x6e,0x6b,
+0x73,0x63,0x61,0x70,0x65,0x3a,0x72,0x61,0x6e,0x64,0x6f,0x6d,0x69,0x7a,0x65,0x64,
+0x3d,0x22,0x30,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x64,0x3d,0x22,0x6d,0x20,0x32,
+0x36,0x35,0x2e,0x33,0x36,0x32,0x34,0x38,0x2c,0x31,0x38,0x35,0x2e,0x39,0x34,0x31,
+0x38,0x31,0x20,0x2d,0x37,0x30,0x2e,0x32,0x30,0x32,0x35,0x35,0x2c,0x33,0x2e,0x37,
+0x36,0x34,0x30,0x37,0x20,0x2d,0x33,0x36,0x2e,0x36,0x39,0x38,0x31,0x32,0x2c,0x35,
+0x39,0x2e,0x39,0x36,0x35,0x30,0x35,0x20,0x4c,0x20,0x31,0x33,0x33,0x2e,0x31,0x38,
+0x38,0x31,0x38,0x2c,0x31,0x38,0x34,0x2e,0x30,0x36,0x37,0x35,0x20,0x36,0x34,0x2e,
+0x38,0x31,0x37,0x36,0x38,0x39,0x2c,0x31,0x36,0x37,0x2e,0x36,0x39,0x35,0x37,0x33,
+0x20,0x31,0x31,0x39,0x2e,0x34,0x30,0x30,0x32,0x38,0x2c,0x31,0x32,0x33,0x2e,0x33,
+0x38,0x36,0x35,0x32,0x20,0x31,0x31,0x33,0x2e,0x38,0x34,0x33,0x31,0x31,0x2c,0x35,
+0x33,0x2e,0x33,0x30,0x33,0x31,0x35,0x37,0x20,0x31,0x37,0x32,0x2e,0x38,0x35,0x30,
+0x36,0x33,0x2c,0x39,0x31,0x2e,0x35,0x32,0x31,0x39,0x38,0x32,0x20,0x32,0x33,0x37,
+0x2e,0x37,0x38,0x36,0x36,0x2c,0x36,0x34,0x2e,0x35,0x37,0x39,0x38,0x35,0x31,0x20,
+0x32,0x31,0x39,0x2e,0x36,0x37,0x32,0x36,0x37,0x2c,0x31,0x33,0x32,0x2e,0x35,0x30,
+0x39,0x36,0x20,0x5a,0x22,0x20,0x2f,0x3e,0x0a,0x20,0x20,0x3c,0x74,0x65,0x78,0x74,
+0x0a,0x20,0x20,0x20,0x20,0x20,0x78,0x6d,0x6c,0x3a,0x73,0x70,0x61,0x63,0x65,0x3d,
+0x22,0x70,0x72,0x65,0x73,0x65,0x72,0x76,0x65,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,
+0x73,0x74,0x79,0x6c,0x65,0x3d,0x22,0x66,0x6f,0x6e,0x74,0x2d,0x73,0x74,0x79,0x6c,
+0x65,0x3a,0x6e,0x6f,0x72,0x6d,0x61,0x6c,0x3b,0x66,0x6f,0x6e,0x74,0x2d,0x76,0x61,
+0x72,0x69,0x61,0x6e,0x74,0x3a,0x6e,0x6f,0x72,0x6d,0x61,0x6c,0x3b,0x66,0x6f,0x6e,
+0x74,0x2d,0x77,0x65,0x69,0x67,0x68,0x74,0x3a,0x6e,0x6f,0x72,0x6d,0x61,0x6c,0x3b,
+0x66,0x6f,0x6e,0x74,0x2d,0x73,0x74,0x72,0x65,0x74,0x63,0x68,0x3a,0x6e,0x6f,0x72,
+0x6d,0x61,0x6c,0x3b,0x66,0x6f,0x6e,0x74,0x2d,0x73,0x69,0x7a,0x65,0x3a,0x31,0x32,
+0x2e,0x38,0x30,0x30,0x30,0x30,0x30,0x31,0x39,0x70,0x78,0x3b,0x6c,0x69,0x6e,0x65,
+0x2d,0x68,0x65,0x69,0x67,0x68,0x74,0x3a,0x30,0x25,0x3b,0x66,0x6f,0x6e,0x74,0x2d,
+0x66,0x61,0x6d,0x69,0x6c,0x79,0x3a,0x73,0x61,0x6e,0x73,0x2d,0x73,0x65,0x72,0x69,
+0x66,0x3b,0x2d,0x69,0x6e,0x6b,0x73,0x63,0x61,0x70,0x65,0x2d,0x66,0x6f,0x6e,0x74,
+0x2d,0x73,0x70,0x65,0x63,0x69,0x66,0x69,0x63,0x61,0x74,0x69,0x6f,0x6e,0x3a,0x53,
+0x61,0x6e,0x73,0x3b,0x74,0x65,0x78,0x74,0x2d,0x61,0x6c,0x69,0x67,0x6e,0x3a,0x73,
+0x74,0x61,0x72,0x74,0x3b,0x6c,0x65,0x74,0x74,0x65,0x72,0x2d,0x73,0x70,0x61,0x63,
+0x69,0x6e,0x67,0x3a,0x30,0x70,0x78,0x3b,0x77,0x6f,0x72,0x64,0x2d,0x73,0x70,0x61,
+0x63,0x69,0x6e,0x67,0x3a,0x30,0x70,0x78,0x3b,0x77,0x72,0x69,0x74,0x69,0x6e,0x67,
+0x2d,0x6d,0x6f,0x64,0x65,0x3a,0x6c,0x72,0x2d,0x74,0x62,0x3b,0x74,0x65,0x78,0x74,
+0x2d,0x61,0x6e,0x63,0x68,0x6f,0x72,0x3a,0x73,0x74,0x61,0x72,0x74,0x3b,0x66,0x69,
+0x6c,0x6c,0x3a,0x23,0x66,0x66,0x34,0x35,0x30,0x30,0x3b,0x66,0x69,0x6c,0x6c,0x2d,
+0x6f,0x70,0x61,0x63,0x69,0x74,0x79,0x3a,0x31,0x3b,0x73,0x74,0x72,0x6f,0x6b,0x65,
+0x3a,0x6e,0x6f,0x6e,0x65,0x3b,0x73,0x74,0x72,0x6f,0x6b,0x65,0x2d,0x77,0x69,0x64,
+0x74,0x68,0x3a,0x31,0x2e,0x30,0x36,0x36,0x36,0x36,0x36,0x37,0x32,0x22,0x0a,0x20,
+0x20,0x20,0x20,0x20,0x78,0x3d,0x22,0x33,0x31,0x39,0x2e,0x33,0x32,0x36,0x34,0x35,
+0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x79,0x3d,0x22,0x33,0x34,0x38,0x2e,0x37,0x36,
+0x34,0x33,0x31,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x69,0x64,0x3d,0x22,0x74,0x65,
+0x78,0x74,0x32,0x39,0x39,0x34,0x22,0x3e,0x3c,0x74,0x73,0x70,0x61,0x6e,0x0a,0x20,
+0x20,0x20,0x20,0x20,0x20,0x20,0x73,0x6f,0x64,0x69,0x70,0x6f,0x64,0x69,0x3a,0x72,
+0x6f,0x6c,0x65,0x3d,0x22,0x6c,0x69,0x6e,0x65,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,
+0x20,0x20,0x69,0x64,0x3d,0x22,0x74,0x73,0x70,0x61,0x6e,0x32,0x39,0x39,0x38,0x22,
+0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x78,0x3d,0x22,0x33,0x31,0x39,0x2e,0x33,
+0x32,0x36,0x34,0x35,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x79,0x3d,0x22,
+0x33,0x34,0x38,0x2e,0x37,0x36,0x34,0x33,0x31,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,
+0x20,0x20,0x73,0x74,0x79,0x6c,0x65,0x3d,0x22,0x66,0x6f,0x6e,0x74,0x2d,0x73,0x69,
+0x7a,0x65,0x3a,0x31,0x35,0x33,0x2e,0x36,0x30,0x30,0x30,0x30,0x36,0x31,0x70,0x78,
+0x3b,0x6c,0x69,0x6e,0x65,0x2d,0x68,0x65,0x69,0x67,0x68,0x74,0x3a,0x31,0x2e,0x32,
+0x35,0x3b,0x66,0x6f,0x6e,0x74,0x2d,0x66,0x61,0x6d,0x69,0x6c,0x79,0x3a,0x73,0x61,
+0x6e,0x73,0x2d,0x73,0x65,0x72,0x69,0x66,0x3b,0x73,0x74,0x72,0x6f,0x6b,0x65,0x2d,
+0x77,0x69,0x64,0x74,0x68,0x3a,0x31,0x2e,0x30,0x36,0x36,0x36,0x36,0x36,0x37,0x32,
+0x22,0x3e,0x6e,0x65,0x77,0x3c,0x2f,0x74,0x73,0x70,0x61,0x6e,0x3e,0x3c,0x74,0x73,
+0x70,0x61,0x6e,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x73,0x6f,0x64,0x69,0x70,
+0x6f,0x64,0x69,0x3a,0x72,0x6f,0x6c,0x65,0x3d,0x22,0x6c,0x69,0x6e,0x65,0x22,0x0a,
+0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x78,0x3d,0x22,0x33,0x31,0x39,0x2e,0x33,0x32,
+0x36,0x34,0x35,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x79,0x3d,0x22,0x35,
+0x34,0x30,0x2e,0x37,0x36,0x34,0x33,0x34,0x22,0x0a,0x20,0x20,0x20,0x20,0x20,0x20,
+0x20,0x69,0x64,0x3d,0x22,0x74,0x73,0x70,0x61,0x6e,0x33,0x30,0x30,0x30,0x22,0x0a,
+0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x73,0x74,0x79,0x6c,0x65,0x3d,0x22,0x66,0x6f,
+0x6e,0x74,0x2d,0x73,0x69,0x7a,0x65,0x3a,0x31,0x35,0x33,0x2e,0x36,0x30,0x30,0x30,
+0x30,0x36,0x31,0x70,0x78,0x3b,0x6c,0x69,0x6e,0x65,0x2d,0x68,0x65,0x69,0x67,0x68,
+0x74,0x3a,0x31,0x2e,0x32,0x35,0x3b,0x66,0x6f,0x6e,0x74,0x2d,0x66,0x61,0x6d,0x69,
+0x6c,0x79,0x3a,0x73,0x61,0x6e,0x73,0x2d,0x73,0x65,0x72,0x69,0x66,0x3b,0x73,0x74,
+0x72,0x6f,0x6b,0x65,0x2d,0x77,0x69,0x64,0x74,0x68,0x3a,0x31,0x2e,0x30,0x36,0x36,
+0x36,0x36,0x36,0x37,0x32,0x22,0x3e,0x20,0x73,0x67,0x76,0x20,0x66,0x69,0x6c,0x65,
+0x3c,0x2f,0x74,0x73,0x70,0x61,0x6e,0x3e,0x3c,0x2f,0x74,0x65,0x78,0x74,0x3e,0x0a,
+0x3c,0x2f,0x73,0x76,0x67,0x3e,0x0a
 };
 
 #endif

diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index aa6535660972ba7eae504e37a4b5d59b6af1fa38..ec2c531a7d3b056c4c8b2eb71ed6fcf638f6bca0 100644 (file)
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -113,7 +113,6 @@ ffmpeg.cfg_params= \
        --enable-pthreads --enable-gpl \
        --disable-ffserver --disable-ffplay \
        --disable-vaapi \
-       --enable-libfaac \
        --enable-libfdk-aac \
        --enable-libtwolame \
        --enable-libopenjpeg \

diff --git a/cinelerra-5.1/thirdparty/downloads.txt b/cinelerra-5.1/thirdparty/downloads.txt
index 94828dc553ae360c85bf60cedfb6bc1298b2c397..bd3e0a89558a92da6c3decc04e1408ecf5f8c127 100644 (file)
--- a/cinelerra-5.1/thirdparty/downloads.txt
+++ b/cinelerra-5.1/thirdparty/downloads.txt
@@ -1,15 +1,18 @@
 http://download-mirror.savannah.gnu.org/releases//openexr/ilmbase-2.2.0.tar.gz
 http://gnu.mirrors.pair.com/savannah/savannah//openexr/openexr-2.2.0.tar.gz
-http://iweb.dl.sourceforge.net/project/opencvlibrary/opencv-unix/3.0.0/opencv-3.0.0.zip
-http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.26.tar.gz
-http://iweb.dl.sourceforge.net/project/libraw1394/libraw1394/libraw1394-2.0.5.tar.gz
-http://libiec61883.sourcearchive.com/downloads/1.2.0-0.1ubuntu3/libiec61883_1.2.0.orig.tar.gz
-http://iweb.dl.sourceforge.net/project/libdv/libdv/1.0.0/libdv-1.0.0.tar.gz
-http://tcpdiag.dl.sourceforge.net/project/libavc1394/libavc1394/libavc1394-0.5.4.tar.gz
+https://sourceforge.net/projects/opencvlibrary/files/latest/download?source=directory = 3.2.0
+https://sourceforge.net/projects/opencore-amr/files/fdk-aac/fdk-aac-0.1.5.tar.gz/download
+http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.28.tar.gz
+https://ieee1394.wiki.kernel.org/index.php/Libraries
+https://www.kernel.org/pub/linux/libs/ieee1394/libraw1394-2.1.2.tar.xz
+https://www.kernel.org/pub/linux/libs/ieee1394/libiec61883-1.2.0.tar.xz
+https://sourceforge.net/projects/libavc1394/files/latest/download?source=directory = 0.5.4
+https://sourceforge.net/projects/libdv/files/latest/download?source=directory
+https://sourceforge.net/projects/giflib/files/latest/download
+https://sourceforge.net/projects/flac/files/latest/download?source=directory
 https://github.com/uclouvain/openjpeg/archive/master.zip = openjpeg-2.1.0-20160221.tar.xz
-http://hivelocity.dl.sourceforge.net/project/giflib/giflib-5.1.1.tar.bz2
-http://sourceforge.net/settings/mirror_choices?projectname=flac&filename=flac-src/flac-1.3.1.tar.xz
-http://www.fftw.org/fftw-3.3.4.tar.gz
+https://sourceforge.net/projects/libjpeg-turbo/files/1.5.1/libjpeg-turbo-1.5.1.tar.gz/download
+http://www.fftw.org/fftw-3.3.6-pl2.tar.gz
 http://festvox.org/packed/festival/2.4/festival-2.4-release.tar.gz
 http://festvox.org/packed/festival/2.4/speech_tools-2.4-release.tar.gz
 http://festvox.org/packed/festival/2.4/voices/festvox_cmu_us_ahw_cg.tar.gz
@@ -17,15 +20,14 @@ http://downloads.sourceforge.net/faac/faac-1.28.tar.bz2
 http://downloads.sourceforge.net/faac/faad2-2.7.tar.bz2
 http://ftp.gnome.org/pub/gnome/sources/esound/0.2/esound-0.2.41.tar.bz2
 http://audiofile.68k.org/audiofile-0.3.6.tar.gz
-http://iweb.dl.sourceforge.net/project/libavc1394/libavc1394/libavc1394-0.5.4.tar.gz
-http://colocrossing.dl.sourceforge.net/project/twolame/twolame/0.3.13/twolame-0.3.13.tar.gz
+https://sourceforge.net/projects/twolame/files/latest/download?source=directory = 0.3.13
 http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.xz
 http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.gz
 http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
-http://tcpdiag.dl.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz
-http://dl.maptools.org/dl/libtiff/tiff-3.8.2.tar.gz
-http://hivelocity.dl.sourceforge.net/project/libuuid/libuuid-1.0.3.tar.gz
-ftp://ftp.videolan.org/pub/x264/snapshots/last_stable_x264.tar.bz2
-https://get.videolan.org/x265/x265_1.9.tar.gz
-http://ffmpeg.org/releases/ffmpeg-3.0.tar.bz2
-https://chromium.googlesource.com/webm/libvpx/+/v1.5.0 = cbecf57f3e0d85a7b7f97f3ab7c507f6fe640a93.tar.gz
+https://sourceforge.net/projects/lame/files/latest/download?source=directory = 3.99.5
+http://dl.maptools.org/dl/libtiff/libtiff-cvsroot, untar, cd libtiff, cvs init, cd /tmp/x, cvs co -d path/libtiff = 4.0.6
+https://sourceforge.net/projects/libuuid/files/latest/download?source=directory - 1.0.3
+ftp://ftp.videolan.org/pub/x264/snapshots/x264-snapshot-20170416-2245-stable.tar.bz2
+https://bitbucket.org/multicoreware/x265/downloads/x265_2.3.tar.gz
+http://ffmpeg.org/releases/ffmpeg-3.3.tar.bz2
+https://chromium.googlesource.com/webm/libvpx/+archive/0c0a05046db1c0b59a7fcc29785a190fdbbe39c2.tar.gz = 1,6,1

diff --git a/cinelerra-5.1/thirdparty/src/fdk-aac-0.1.4.tar.xz b/cinelerra-5.1/thirdparty/src/fdk-aac-0.1.4.tar.xz
deleted file mode 100644 (file)
index 844fd3c..0000000
Binary files a/cinelerra-5.1/thirdparty/src/fdk-aac-0.1.4.tar.xz and /dev/null differ

diff --git a/cinelerra-5.1/thirdparty/src/fdk-aac-0.1.5.tar.xz b/cinelerra-5.1/thirdparty/src/fdk-aac-0.1.5.tar.xz
new file mode 100644 (file)
index 0000000..e3d4de0
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/fdk-aac-0.1.5.tar.xz differ

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg-3.1.4.tar.xz b/cinelerra-5.1/thirdparty/src/ffmpeg-3.1.4.tar.xz
deleted file mode 100644 (file)
index 8008b3a..0000000
Binary files a/cinelerra-5.1/thirdparty/src/ffmpeg-3.1.4.tar.xz and /dev/null differ

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg-3.3.tar.xz b/cinelerra-5.1/thirdparty/src/ffmpeg-3.3.tar.xz
new file mode 100644 (file)
index 0000000..7856785
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/ffmpeg-3.3.tar.xz differ

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.patch1 b/cinelerra-5.1/thirdparty/src/ffmpeg.patch1
index 6f0f0d48718d6b6071274dd34669c234567b1a55..295779d2475717a00552a65d968e53215dfa82cb 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.patch1
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.patch1
@@ -1,6 +1,7 @@
---- a/configure        2015-09-10 13:36:03.763986195 -0600
-+++ b/configure        2015-09-10 13:37:25.190550438 -0600
-@@ -5735,7 +5735,9 @@
+diff -urN a/configure b/configure
+--- a/configure        2017-04-12 19:55:54.000000000 -0600
++++ b/configure        2017-04-16 16:12:23.518837543 -0600
+@@ -5871,7 +5871,9 @@
                                 die "ERROR: libx264 must be installed and version must be >= 0.118."; } &&
                               { check_cpp_condition x264.h "X264_MPEG2" &&
                                 enable libx262; }
@@ -10,4 +11,4 @@
 +                                 warn "using libx265 without pkg-config"; } } &&
                               { check_cpp_condition x265.h "X265_BUILD >= 68" ||
                                 die "ERROR: libx265 version must be >= 68."; }
- enabled libxavs           && require libxavs xavs.h xavs_encoder_encode -lxavs
+ enabled libxavs           && require libxavs "stdint.h xavs.h" xavs_encoder_encode -lxavs

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.patch3 b/cinelerra-5.1/thirdparty/src/ffmpeg.patch3
index 3b1783d7d0e6ebab5585619b51af59d49ff9fc91..0644623b4c42f9115f12b0278e092c6903bbdfbb 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.patch3
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.patch3
@@ -1,7 +1,16 @@
-diff -ur ffmpeg-3.1.1.orig/libavcodec/avcodec.h ffmpeg-3.1.1/libavcodec/avcodec.h
---- ffmpeg-3.1.1.orig/libavcodec/avcodec.h     2016-06-26 17:54:28.000000000 -0600
-+++ ffmpeg-3.1.1/libavcodec/avcodec.h  2016-07-08 09:32:20.040623502 -0600
-@@ -4700,7 +4700,7 @@
+diff -urN a/libavcodec/avcodec.h b/libavcodec/avcodec.h
+--- a/libavcodec/avcodec.h     2017-04-12 19:55:55.000000000 -0600
++++ b/libavcodec/avcodec.h     2017-04-16 16:16:04.497012383 -0600
+@@ -4600,7 +4600,7 @@
+ attribute_deprecated
+ int av_packet_merge_side_data(AVPacket *pkt);
+ 
+-attribute_deprecated
++//attribute_deprecated
+ int av_packet_split_side_data(AVPacket *pkt);
+ #endif
+ 
+@@ -4838,7 +4838,7 @@
   *
  * @deprecated Use avcodec_send_packet() and avcodec_receive_frame().
   */
@@ -10,7 +19,7 @@ diff -ur ffmpeg-3.1.1.orig/libavcodec/avcodec.h ffmpeg-3.1.1/libavcodec/avcodec.
  int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame,
                            int *got_frame_ptr, const AVPacket *avpkt);
  
-@@ -4749,7 +4749,7 @@
+@@ -4887,7 +4887,7 @@
   *
   * @deprecated Use avcodec_send_packet() and avcodec_receive_frame().
   */
@@ -19,7 +28,7 @@ diff -ur ffmpeg-3.1.1.orig/libavcodec/avcodec.h ffmpeg-3.1.1/libavcodec/avcodec.
  int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
                           int *got_picture_ptr,
                           const AVPacket *avpkt);
-@@ -5218,7 +5218,7 @@
+@@ -5363,7 +5363,7 @@
   *
   * @deprecated use avcodec_send_frame()/avcodec_receive_packet() instead
   */
@@ -28,7 +37,7 @@ diff -ur ffmpeg-3.1.1.orig/libavcodec/avcodec.h ffmpeg-3.1.1/libavcodec/avcodec.
  int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
                            const AVFrame *frame, int *got_packet_ptr);
  
-@@ -5257,7 +5257,7 @@
+@@ -5402,7 +5402,7 @@
   *
   * @deprecated use avcodec_send_frame()/avcodec_receive_packet() instead
   */
@@ -37,7 +46,7 @@ diff -ur ffmpeg-3.1.1.orig/libavcodec/avcodec.h ffmpeg-3.1.1/libavcodec/avcodec.
  int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt,
                            const AVFrame *frame, int *got_packet_ptr);
  
-@@ -5778,7 +5778,7 @@
+@@ -5924,7 +5924,7 @@
   * @return a bitstream filter context if a matching filter was found
   * and successfully initialized, NULL otherwise
   */
@@ -46,7 +55,7 @@ diff -ur ffmpeg-3.1.1.orig/libavcodec/avcodec.h ffmpeg-3.1.1/libavcodec/avcodec.
  AVBitStreamFilterContext *av_bitstream_filter_init(const char *name);
  
  /**
-@@ -5810,7 +5810,7 @@
+@@ -5956,7 +5956,7 @@
   * its starting address). A special case is if *poutbuf was set to NULL and
   * *poutbuf_size was set to 0, which indicates the packet should be dropped.
   */
@@ -55,7 +64,7 @@ diff -ur ffmpeg-3.1.1.orig/libavcodec/avcodec.h ffmpeg-3.1.1/libavcodec/avcodec.
  int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
                                 AVCodecContext *avctx, const char *args,
                                 uint8_t **poutbuf, int *poutbuf_size,
-@@ -5822,7 +5822,7 @@
+@@ -5968,7 +5968,7 @@
   * @param bsf the bitstream filter context created with
   * av_bitstream_filter_init(), can be NULL
   */
@@ -64,10 +73,10 @@ diff -ur ffmpeg-3.1.1.orig/libavcodec/avcodec.h ffmpeg-3.1.1/libavcodec/avcodec.
  void av_bitstream_filter_close(AVBitStreamFilterContext *bsf);
  
  /**
-diff -ur ffmpeg-3.1.1.orig/libavformat/avformat.h ffmpeg-3.1.1/libavformat/avformat.h
---- ffmpeg-3.1.1.orig/libavformat/avformat.h   2016-06-30 19:00:55.000000000 -0600
-+++ ffmpeg-3.1.1/libavformat/avformat.h        2016-07-08 09:33:16.610668989 -0600
-@@ -876,7 +876,7 @@
+diff -urN a/libavformat/avformat.h b/libavformat/avformat.h
+--- a/libavformat/avformat.h   2017-04-12 19:55:55.000000000 -0600
++++ b/libavformat/avformat.h   2017-04-16 16:16:04.499012276 -0600
+@@ -889,7 +889,7 @@
      /**
       * @deprecated use the codecpar struct instead
       */

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.patch4 b/cinelerra-5.1/thirdparty/src/ffmpeg.patch4
index 0793e47afda329dd9f8c124e0555e6dd22498724..66edd3db49ffd6a5972e0987c966539ff2cac499 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.patch4
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.patch4
@@ -1,6 +1,7 @@
---- a/libavformat/mpegtsenc.c  2017-02-02 10:53:52.235702393 -0700
-+++ b/libavformat/mpegtsenc.c  2017-02-02 11:53:38.863560974 -0700
-@@ -55,9 +55,8 @@
+diff -urN a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
+--- a/libavformat/mpegtsenc.c  2017-04-12 19:55:55.000000000 -0600
++++ b/libavformat/mpegtsenc.c  2017-04-16 16:40:18.488361991 -0600
+@@ -56,9 +56,8 @@
      int sid;           /* service ID */
      char *name;
      char *provider_name;
@@ -12,7 +13,7 @@
      AVProgram *program;
  } MpegTSService;
  
-@@ -77,14 +76,12 @@
+@@ -78,14 +77,12 @@
      MpegTSSection pat; /* MPEG-2 PAT table */
      MpegTSSection sdt; /* MPEG-2 SDT table context */
      MpegTSService **services;
@@ -30,7 +31,7 @@
      int mux_rate; ///< set to 1 when VBR
      int pes_payload_size;
  
-@@ -94,12 +91,14 @@
+@@ -95,12 +92,14 @@
      int service_type;
  
      int pmt_start_pid;
@@ -46,7 +47,7 @@
  #define MPEGTS_FLAG_REEMIT_PAT_PMT  0x01
  #define MPEGTS_FLAG_AAC_LATM        0x02
  #define MPEGTS_FLAG_PAT_PMT_AT_FRAMES           0x04
-@@ -109,8 +108,6 @@
+@@ -111,8 +110,6 @@
      int tables_version;
      double pat_period;
      double sdt_period;
@@ -55,7 +56,7 @@
  
      int omit_video_pes_length;
  } MpegTSWrite;
-@@ -214,10 +211,10 @@
+@@ -222,10 +219,10 @@
  #define DEFAULT_PROVIDER_NAME   "FFmpeg"
  #define DEFAULT_SERVICE_NAME    "Service01"
  
@@ -68,7 +69,7 @@
  
  typedef struct MpegTSWriteStream {
      struct MpegTSService *service;
-@@ -704,6 +701,7 @@
+@@ -717,6 +714,7 @@
      service->pmt.pid       = ts->pmt_start_pid + ts->nb_services;
      service->sid           = sid;
      service->pcr_pid       = 0x1fff;
@@ -76,7 +77,7 @@
      service->provider_name = av_strdup(provider_name);
      service->name          = av_strdup(name);
      if (!service->provider_name || !service->name)
-@@ -719,18 +717,11 @@
+@@ -732,18 +730,11 @@
      return NULL;
  }
  
@@ -96,7 +97,7 @@
          tp_extra_header = AV_RB32(&tp_extra_header);
          avio_write(s->pb, (unsigned char *) &tp_extra_header,
                     sizeof(tp_extra_header));
-@@ -751,6 +742,7 @@
+@@ -764,6 +755,7 @@
      MpegTSService *service;
      AVStream *st, *pcr_st = NULL;
      AVDictionaryEntry *title, *provider;
@@ -104,7 +105,7 @@
      int i, j;
      const char *service_name;
      const char *provider_name;
-@@ -759,6 +751,15 @@
+@@ -772,6 +764,15 @@
  
      if (s->max_delay < 0) /* Not set by the caller */
          s->max_delay = 0;
@@ -120,7 +121,7 @@
  
      // round up to a whole number of TS packets
      ts->pes_payload_size = (ts->pes_payload_size + 14 + 183) / 184 * 184 - 14;
-@@ -803,6 +804,8 @@
+@@ -818,6 +819,8 @@
              service->program          = program;
          }
      }
@@ -129,8 +130,8 @@
  
      ts->pat.pid          = PAT_PID;
      /* Initialize at 15 so that it wraps and is equal to 0 for the
-@@ -885,10 +888,9 @@
-         ts_st->cc              = 15;
+@@ -903,10 +906,9 @@
+         ts_st->discontinuity   = ts->flags & MPEGTS_FLAG_DISCONT;
          /* update PCR pid by using the first video stream */
          if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO &&
 -            service->pcr_pid == 0x1fff) {
@@ -142,7 +143,7 @@
          if (st->codecpar->codec_id == AV_CODEC_ID_AAC &&
              st->codecpar->extradata_size > 0) {
              AVStream *ast;
-@@ -924,78 +926,47 @@
+@@ -942,78 +944,47 @@
      av_freep(&pids);
  
      /* if no video stream, use the first stream as PCR */
@@ -253,7 +254,7 @@
  
      return 0;
  
-@@ -1010,22 +981,12 @@
+@@ -1028,22 +999,12 @@
      MpegTSWrite *ts = s->priv_data;
      int i;
  
@@ -280,7 +281,7 @@
          mpegts_write_pat(s);
          for (i = 0; i < ts->nb_services; i++)
              mpegts_write_pmt(s, ts->services[i]);
-@@ -1067,20 +1028,21 @@
+@@ -1085,13 +1046,14 @@
  {
      MpegTSWrite *ts = s->priv_data;
      MpegTSWriteStream *ts_st = st->priv_data;
@@ -297,7 +298,8 @@
      *q++ = 0x20 | ts_st->cc;   /* Adaptation only */
      /* Continuity Count field does not increment (see 13818-1 section 2.4.3.3) */
      *q++ = TS_PACKET_SIZE - 5; /* Adaptation Field Length */
-     *q++ = 0x10;               /* Adaptation flags: PCR present */
+@@ -1102,7 +1064,7 @@
+     }
  
      /* PCR coded into 6 bytes */
 -    q += write_pcr_bits(q, get_pcr(ts, s->pb));
@@ -305,7 +307,7 @@
  
      /* stuffing bytes */
      memset(q, 0xFF, TS_PACKET_SIZE - (q - buf));
-@@ -1149,8 +1111,6 @@
+@@ -1171,8 +1133,6 @@
      uint8_t *q;
      int val, is_start, len, header_len, write_pcr, is_dvb_subtitle, is_dvb_teletext, flags;
      int afc_len, stuffing_len;
@@ -314,7 +316,7 @@
      int force_pat = st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && key && !ts_st->prev_payload_key;
  
      av_assert0(ts_st->payload != buf || st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO);
-@@ -1160,28 +1120,33 @@
+@@ -1182,28 +1142,33 @@
  
      is_start = 1;
      while (payload_size > 0) {
@@ -361,7 +363,7 @@
              continue;
          }
  
-@@ -1191,13 +1156,17 @@
+@@ -1213,6 +1178,10 @@
          val  = ts_st->pid >> 8;
          if (is_start)
              val |= 0x40;
@@ -372,7 +374,8 @@
          *q++      = val;
          *q++      = ts_st->pid;
          ts_st->cc = ts_st->cc + 1 & 0xf;
-         *q++      = 0x10 | ts_st->cc; // payload indicator + CC
+@@ -1224,7 +1193,7 @@
+         }
          if (key && is_start && pts != AV_NOPTS_VALUE) {
              // set Random Access for key frames
 -            if (ts_st->pid == ts_st->service->pcr_pid)
@@ -380,7 +383,7 @@
                  write_pcr = 1;
              set_af_flag(buf, 0x40);
              q = get_ts_payload_start(buf);
-@@ -1205,14 +1174,10 @@
+@@ -1232,14 +1201,10 @@
          if (write_pcr) {
              set_af_flag(buf, 0x10);
              q = get_ts_payload_start(buf);
@@ -397,7 +400,7 @@
              q = get_ts_payload_start(buf);
          }
          if (is_start) {
-@@ -1310,11 +1275,13 @@
+@@ -1340,11 +1305,13 @@
              *q++ = flags;
              *q++ = header_len;
              if (pts != AV_NOPTS_VALUE) {
@@ -413,7 +416,7 @@
                  q += 5;
              }
              if (pes_extension && st->codecpar->codec_id == AV_CODEC_ID_DIRAC) {
-@@ -1483,7 +1450,6 @@
+@@ -1515,7 +1482,6 @@
      uint8_t *data = NULL;
      MpegTSWrite *ts = s->priv_data;
      MpegTSWriteStream *ts_st = st->priv_data;
@@ -421,7 +424,7 @@
      int64_t dts = pkt->dts, pts = pkt->pts;
      int opus_samples = 0;
      int side_data_size;
-@@ -1504,16 +1470,15 @@
+@@ -1536,16 +1502,15 @@
      }
  
      if (ts->flags & MPEGTS_FLAG_REEMIT_PAT_PMT) {
@@ -441,7 +444,7 @@
      }
  
      if (ts_st->first_pts_check && pts == AV_NOPTS_VALUE) {
-@@ -1671,7 +1636,7 @@
+@@ -1733,7 +1698,7 @@
              AVStream *st2 = s->streams[i];
              MpegTSWriteStream *ts_st2 = st2->priv_data;
              if (   ts_st2->payload_size
@@ -450,7 +453,7 @@
                  mpegts_write_pes(s, st2, ts_st2->payload, ts_st2->payload_size,
                                   ts_st2->payload_pts, ts_st2->payload_dts,
                                   ts_st2->payload_flags & AV_PKT_FLAG_KEY, stream_id);
-@@ -1838,12 +1803,18 @@
+@@ -1904,12 +1869,18 @@
      { "mpegts_pmt_start_pid", "Set the first pid of the PMT.",
        offsetof(MpegTSWrite, pmt_start_pid), AV_OPT_TYPE_INT,
        { .i64 = 0x1000 }, 0x0010, 0x1f00, AV_OPT_FLAG_ENCODING_PARAM },
@@ -459,7 +462,7 @@
 +      { .i64 = 0x1000 }, 0x0010, 0x1f00, AV_OPT_FLAG_ENCODING_PARAM },
      { "mpegts_start_pid", "Set the first pid.",
        offsetof(MpegTSWrite, start_pid), AV_OPT_TYPE_INT,
-       { .i64 = 0x0100 }, 0x0020, 0x0f00, AV_OPT_FLAG_ENCODING_PARAM },
+       { .i64 = 0x0100 }, 0x0010, 0x0f00, AV_OPT_FLAG_ENCODING_PARAM },
      { "mpegts_m2ts_mode", "Enable m2ts mode.",
        offsetof(MpegTSWrite, m2ts_mode), AV_OPT_TYPE_BOOL,
 -      { .i64 = -1 }, -1, 1, AV_OPT_FLAG_ENCODING_PARAM },
@@ -470,11 +473,11 @@
      { "muxrate", NULL,
        offsetof(MpegTSWrite, mux_rate), AV_OPT_TYPE_INT,
        { .i64 = 1 }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
-@@ -1878,15 +1849,15 @@
+@@ -1947,15 +1918,15 @@
      { "omit_video_pes_length", "Omit the PES packet length for video packets",
        offsetof(MpegTSWrite, omit_video_pes_length), AV_OPT_TYPE_BOOL,
        { .i64 = 1 }, 0, 1, AV_OPT_FLAG_ENCODING_PARAM },
--    { "pcr_period", "PCR retransmission time",
+-    { "pcr_period", "PCR retransmission time in milliseconds",
 -      offsetof(MpegTSWrite, pcr_period), AV_OPT_TYPE_INT,
 -      { .i64 = PCR_RETRANS_TIME }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
 -    { "pat_period", "PAT/PMT retransmission time limit in seconds",

diff --git a/cinelerra-5.1/thirdparty/src/fftw-3.3.4.tar.xz b/cinelerra-5.1/thirdparty/src/fftw-3.3.4.tar.xz
deleted file mode 100644 (file)
index 8da8d7a..0000000
Binary files a/cinelerra-5.1/thirdparty/src/fftw-3.3.4.tar.xz and /dev/null differ

diff --git a/cinelerra-5.1/thirdparty/src/fftw-3.3.6-pl2.tar.xz b/cinelerra-5.1/thirdparty/src/fftw-3.3.6-pl2.tar.xz
new file mode 100644 (file)
index 0000000..c6fe371
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/fftw-3.3.6-pl2.tar.xz differ

diff --git a/cinelerra-5.1/thirdparty/src/flac-1.3.1.tar.xz b/cinelerra-5.1/thirdparty/src/flac-1.3.1.tar.xz
deleted file mode 100644 (file)
index 441b8cc..0000000
Binary files a/cinelerra-5.1/thirdparty/src/flac-1.3.1.tar.xz and /dev/null differ

diff --git a/cinelerra-5.1/thirdparty/src/flac-1.3.2.tar.xz b/cinelerra-5.1/thirdparty/src/flac-1.3.2.tar.xz
new file mode 100644 (file)
index 0000000..5b9c69a
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/flac-1.3.2.tar.xz differ

diff --git a/cinelerra-5.1/thirdparty/src/giflib-5.1.2.tar.xz b/cinelerra-5.1/thirdparty/src/giflib-5.1.2.tar.xz
deleted file mode 100644 (file)
index 88fb3c0..0000000
Binary files a/cinelerra-5.1/thirdparty/src/giflib-5.1.2.tar.xz and /dev/null differ

diff --git a/cinelerra-5.1/thirdparty/src/giflib-5.1.4.tar.xz b/cinelerra-5.1/thirdparty/src/giflib-5.1.4.tar.xz
new file mode 100644 (file)
index 0000000..86cae55
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/giflib-5.1.4.tar.xz differ

diff --git a/cinelerra-5.1/thirdparty/src/libjpeg-turbo-1.4.0.tar.xz b/cinelerra-5.1/thirdparty/src/libjpeg-turbo-1.4.0.tar.xz
deleted file mode 100644 (file)
index c7a909f..0000000
Binary files a/cinelerra-5.1/thirdparty/src/libjpeg-turbo-1.4.0.tar.xz and /dev/null differ

diff --git a/cinelerra-5.1/thirdparty/src/libjpeg-turbo-1.5.1.tar.xz b/cinelerra-5.1/thirdparty/src/libjpeg-turbo-1.5.1.tar.xz
new file mode 100644 (file)
index 0000000..2d5ddf8
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/libjpeg-turbo-1.5.1.tar.xz differ

diff --git a/cinelerra-5.1/thirdparty/src/libraw1394-2.0.5.tar.xz b/cinelerra-5.1/thirdparty/src/libraw1394-2.0.5.tar.xz
deleted file mode 100644 (file)
index 9ed8800..0000000
Binary files a/cinelerra-5.1/thirdparty/src/libraw1394-2.0.5.tar.xz and /dev/null differ

diff --git a/cinelerra-5.1/thirdparty/src/libraw1394-2.1.2.tar.xz b/cinelerra-5.1/thirdparty/src/libraw1394-2.1.2.tar.xz
new file mode 100644 (file)
index 0000000..c66741e
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/libraw1394-2.1.2.tar.xz differ

diff --git a/cinelerra-5.1/thirdparty/src/libsndfile-1.0.26.tar.xz b/cinelerra-5.1/thirdparty/src/libsndfile-1.0.26.tar.xz
deleted file mode 100644 (file)
index 3401ccf..0000000
Binary files a/cinelerra-5.1/thirdparty/src/libsndfile-1.0.26.tar.xz and /dev/null differ

diff --git a/cinelerra-5.1/thirdparty/src/libsndfile-1.0.28.tar.xz b/cinelerra-5.1/thirdparty/src/libsndfile-1.0.28.tar.xz
new file mode 100644 (file)
index 0000000..f0017f8
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/libsndfile-1.0.28.tar.xz differ

diff --git a/cinelerra-5.1/thirdparty/src/libvpx-1.5.0.tar.xz b/cinelerra-5.1/thirdparty/src/libvpx-1.5.0.tar.xz
deleted file mode 100644 (file)
index 8ee6ef2..0000000
Binary files a/cinelerra-5.1/thirdparty/src/libvpx-1.5.0.tar.xz and /dev/null differ

diff --git a/cinelerra-5.1/thirdparty/src/libvpx-1.6.1.tar.xz b/cinelerra-5.1/thirdparty/src/libvpx-1.6.1.tar.xz
new file mode 100644 (file)
index 0000000..c982258
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/libvpx-1.6.1.tar.xz differ

diff --git a/cinelerra-5.1/thirdparty/src/tiff-3.8.2.tar.xz b/cinelerra-5.1/thirdparty/src/tiff-3.8.2.tar.xz
deleted file mode 100644 (file)
index d87da9f..0000000
Binary files a/cinelerra-5.1/thirdparty/src/tiff-3.8.2.tar.xz and /dev/null differ

diff --git a/cinelerra-5.1/thirdparty/src/tiff-4.0.6.tar.xz b/cinelerra-5.1/thirdparty/src/tiff-4.0.6.tar.xz
new file mode 100644 (file)
index 0000000..1792257
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/tiff-4.0.6.tar.xz differ

diff --git a/cinelerra-5.1/thirdparty/src/x264-20160221.tar.xz b/cinelerra-5.1/thirdparty/src/x264-20160221.tar.xz
deleted file mode 100644 (file)
index 5c66aa9..0000000
Binary files a/cinelerra-5.1/thirdparty/src/x264-20160221.tar.xz and /dev/null differ

diff --git a/cinelerra-5.1/thirdparty/src/x264-snapshot-20170416-2245-stable.tar.xz b/cinelerra-5.1/thirdparty/src/x264-snapshot-20170416-2245-stable.tar.xz
new file mode 100644 (file)
index 0000000..0ddf716
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/x264-snapshot-20170416-2245-stable.tar.xz differ

diff --git a/cinelerra-5.1/thirdparty/src/x265_2.1.tar.xz b/cinelerra-5.1/thirdparty/src/x265_2.1.tar.xz
deleted file mode 100644 (file)
index 900b941..0000000
Binary files a/cinelerra-5.1/thirdparty/src/x265_2.1.tar.xz and /dev/null differ

diff --git a/cinelerra-5.1/thirdparty/src/x265_2.3.tar.xz b/cinelerra-5.1/thirdparty/src/x265_2.3.tar.xz
new file mode 100644 (file)
index 0000000..98e8a23
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/x265_2.3.tar.xz differ