diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/.gitignore b/trunk/3rdparty/ffmpeg-4-fit/.gitignore
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/.gitignore
rename to trunk/3rdparty/ffmpeg-4-fit/.gitignore
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/.version b/trunk/3rdparty/ffmpeg-4-fit/.version
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/.version
rename to trunk/3rdparty/ffmpeg-4-fit/.version
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/Makefile b/trunk/3rdparty/ffmpeg-4-fit/Makefile
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/Makefile
rename to trunk/3rdparty/ffmpeg-4-fit/Makefile
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/compat/atomics/gcc/stdatomic.h b/trunk/3rdparty/ffmpeg-4-fit/compat/atomics/gcc/stdatomic.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/compat/atomics/gcc/stdatomic.h
rename to trunk/3rdparty/ffmpeg-4-fit/compat/atomics/gcc/stdatomic.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/compat/va_copy.h b/trunk/3rdparty/ffmpeg-4-fit/compat/va_copy.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/compat/va_copy.h
rename to trunk/3rdparty/ffmpeg-4-fit/compat/va_copy.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/configure b/trunk/3rdparty/ffmpeg-4-fit/configure
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/configure
rename to trunk/3rdparty/ffmpeg-4-fit/configure
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/ffbuild/arch.mak b/trunk/3rdparty/ffmpeg-4-fit/ffbuild/arch.mak
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/ffbuild/arch.mak
rename to trunk/3rdparty/ffmpeg-4-fit/ffbuild/arch.mak
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/ffbuild/common.mak b/trunk/3rdparty/ffmpeg-4-fit/ffbuild/common.mak
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/ffbuild/common.mak
rename to trunk/3rdparty/ffmpeg-4-fit/ffbuild/common.mak
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/ffbuild/library.mak b/trunk/3rdparty/ffmpeg-4-fit/ffbuild/library.mak
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/ffbuild/library.mak
rename to trunk/3rdparty/ffmpeg-4-fit/ffbuild/library.mak
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/ffbuild/libversion.sh b/trunk/3rdparty/ffmpeg-4-fit/ffbuild/libversion.sh
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/ffbuild/libversion.sh
rename to trunk/3rdparty/ffmpeg-4-fit/ffbuild/libversion.sh
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/ffbuild/pkgconfig_generate.sh b/trunk/3rdparty/ffmpeg-4-fit/ffbuild/pkgconfig_generate.sh
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/ffbuild/pkgconfig_generate.sh
rename to trunk/3rdparty/ffmpeg-4-fit/ffbuild/pkgconfig_generate.sh
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/ffbuild/version.sh b/trunk/3rdparty/ffmpeg-4-fit/ffbuild/version.sh
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/ffbuild/version.sh
rename to trunk/3rdparty/ffmpeg-4-fit/ffbuild/version.sh
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/Makefile b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/Makefile
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/Makefile
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/Makefile
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aac.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aac.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aac.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aac.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aac_ac3_parser.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aac_ac3_parser.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aac_ac3_parser.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aac_ac3_parser.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aac_ac3_parser.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aac_ac3_parser.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aac_ac3_parser.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aac_ac3_parser.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aac_adtstoasc_bsf.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aac_adtstoasc_bsf.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aac_adtstoasc_bsf.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aac_adtstoasc_bsf.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aac_defines.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aac_defines.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aac_defines.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aac_defines.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aac_parser.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aac_parser.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aac_parser.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aac_parser.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aaccoder.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aaccoder.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aaccoder.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aaccoder.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aaccoder_trellis.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aaccoder_trellis.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aaccoder_trellis.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aaccoder_trellis.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aaccoder_twoloop.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aaccoder_twoloop.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aaccoder_twoloop.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aaccoder_twoloop.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacdec.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacdec.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacdec.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacdec.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacdec_fixed.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacdec_fixed.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacdec_fixed.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacdec_fixed.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacdec_template.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacdec_template.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacdec_template.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacdec_template.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacdectab.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacdectab.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacdectab.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacdectab.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_is.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_is.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_is.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_is.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_is.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_is.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_is.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_is.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_ltp.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_ltp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_ltp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_ltp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_ltp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_ltp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_ltp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_ltp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_pred.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_pred.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_pred.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_pred.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_pred.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_pred.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_pred.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_pred.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_quantization.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_quantization.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_quantization.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_quantization.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_quantization_misc.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_quantization_misc.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_quantization_misc.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_quantization_misc.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_tns.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_tns.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_tns.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_tns.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_tns.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_tns.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_tns.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_tns.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_utils.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_utils.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenc_utils.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenc_utils.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacencdsp.asm b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacencdsp.asm
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacencdsp.asm
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacencdsp.asm
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacencdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacencdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacencdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacencdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenctab.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenctab.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenctab.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenctab.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenctab.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenctab.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacenctab.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacenctab.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacps.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacps.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacps.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacps.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacps.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacps.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacps.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacps.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacps_fixed.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacps_fixed.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacps_fixed.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacps_fixed.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacps_fixed_tablegen.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacps_fixed_tablegen.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacps_fixed_tablegen.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacps_fixed_tablegen.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacps_fixed_tablegen.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacps_fixed_tablegen.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacps_fixed_tablegen.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacps_fixed_tablegen.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacps_float.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacps_float.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacps_float.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacps_float.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacps_tablegen.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacps_tablegen.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacps_tablegen.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacps_tablegen.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacps_tablegen.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacps_tablegen.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacps_tablegen.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacps_tablegen.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacps_tablegen_template.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacps_tablegen_template.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacps_tablegen_template.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacps_tablegen_template.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacpsdata.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacpsdata.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacpsdata.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacpsdata.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacpsdsp.asm b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacpsdsp.asm
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacpsdsp.asm
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacpsdsp.asm
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacpsdsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacpsdsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacpsdsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacpsdsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacpsdsp_fixed.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacpsdsp_fixed.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacpsdsp_fixed.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacpsdsp_fixed.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacpsdsp_float.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacpsdsp_float.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacpsdsp_float.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacpsdsp_float.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacpsdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacpsdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacpsdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacpsdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacpsdsp_template.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacpsdsp_template.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacpsdsp_template.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacpsdsp_template.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacpsy.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacpsy.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacpsy.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacpsy.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacsbr.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacsbr.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacsbr.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacsbr.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacsbr.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacsbr.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacsbr.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacsbr.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacsbr_fixed.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacsbr_fixed.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacsbr_fixed.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacsbr_fixed.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacsbr_fixed_tablegen.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacsbr_fixed_tablegen.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacsbr_fixed_tablegen.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacsbr_fixed_tablegen.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacsbr_tablegen.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacsbr_tablegen.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacsbr_tablegen.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacsbr_tablegen.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacsbr_tablegen_common.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacsbr_tablegen_common.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacsbr_tablegen_common.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacsbr_tablegen_common.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacsbr_template.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacsbr_template.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacsbr_template.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacsbr_template.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacsbrdata.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacsbrdata.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aacsbrdata.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aacsbrdata.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aactab.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aactab.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aactab.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aactab.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aactab.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aactab.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aactab.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aactab.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/Makefile b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/Makefile
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/Makefile
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/Makefile
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/aacpsdsp_init_aarch64.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/aacpsdsp_init_aarch64.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/aacpsdsp_init_aarch64.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/aacpsdsp_init_aarch64.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/asm-offsets.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/asm-offsets.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/asm-offsets.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/asm-offsets.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/cabac.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/cabac.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/cabac.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/cabac.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/fft_init_aarch64.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/fft_init_aarch64.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/fft_init_aarch64.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/fft_init_aarch64.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/fmtconvert_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/fmtconvert_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/fmtconvert_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/fmtconvert_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/h264chroma_init_aarch64.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/h264chroma_init_aarch64.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/h264chroma_init_aarch64.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/h264chroma_init_aarch64.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/h264dsp_init_aarch64.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/h264dsp_init_aarch64.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/h264dsp_init_aarch64.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/h264dsp_init_aarch64.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/h264pred_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/h264pred_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/h264pred_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/h264pred_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/h264qpel_init_aarch64.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/h264qpel_init_aarch64.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/h264qpel_init_aarch64.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/h264qpel_init_aarch64.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/hpeldsp_init_aarch64.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/hpeldsp_init_aarch64.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/hpeldsp_init_aarch64.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/hpeldsp_init_aarch64.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/idct.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/idct.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/idct.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/idct.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/idctdsp_init_aarch64.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/idctdsp_init_aarch64.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/idctdsp_init_aarch64.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/idctdsp_init_aarch64.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/mpegaudiodsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/mpegaudiodsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/mpegaudiodsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/mpegaudiodsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/opusdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/opusdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/opusdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/opusdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/rv40dsp_init_aarch64.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/rv40dsp_init_aarch64.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/rv40dsp_init_aarch64.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/rv40dsp_init_aarch64.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/sbrdsp_init_aarch64.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/sbrdsp_init_aarch64.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/sbrdsp_init_aarch64.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/sbrdsp_init_aarch64.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/synth_filter_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/synth_filter_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/synth_filter_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/synth_filter_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/vc1dsp_init_aarch64.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/vc1dsp_init_aarch64.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/vc1dsp_init_aarch64.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/vc1dsp_init_aarch64.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/videodsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/videodsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/videodsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/videodsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/vorbisdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/vorbisdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/vorbisdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/vorbisdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/vp8dsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/vp8dsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/vp8dsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/vp8dsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/vp8dsp_init_aarch64.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/vp8dsp_init_aarch64.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/vp8dsp_init_aarch64.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/vp8dsp_init_aarch64.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/vp9dsp_init.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/vp9dsp_init.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/vp9dsp_init.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/vp9dsp_init.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/vp9dsp_init_10bpp_aarch64.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/vp9dsp_init_10bpp_aarch64.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/vp9dsp_init_10bpp_aarch64.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/vp9dsp_init_10bpp_aarch64.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/vp9dsp_init_12bpp_aarch64.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/vp9dsp_init_12bpp_aarch64.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/vp9dsp_init_12bpp_aarch64.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/vp9dsp_init_12bpp_aarch64.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/vp9dsp_init_16bpp_aarch64_template.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/vp9dsp_init_16bpp_aarch64_template.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/vp9dsp_init_16bpp_aarch64_template.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/vp9dsp_init_16bpp_aarch64_template.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/vp9dsp_init_aarch64.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/vp9dsp_init_aarch64.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/aarch64/vp9dsp_init_aarch64.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/aarch64/vp9dsp_init_aarch64.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3_parser.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3_parser.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3_parser.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3_parser.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3_parser.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3_parser.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3_parser.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3_parser.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3_parser_internal.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3_parser_internal.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3_parser_internal.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3_parser_internal.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3dec.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3dec.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3dec.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3dec.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3dec.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3dec.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3dec.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3dec.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3dec_data.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3dec_data.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3dec_data.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3dec_data.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3dec_data.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3dec_data.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3dec_data.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3dec_data.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3dec_fixed.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3dec_fixed.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3dec_fixed.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3dec_fixed.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3dec_float.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3dec_float.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3dec_float.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3dec_float.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3dsp.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3dsp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3dsp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3dsp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3dsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3dsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3dsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3dsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3enc.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3enc.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3enc.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3enc.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3enc.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3enc.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3enc.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3enc.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3enc_fixed.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3enc_fixed.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3enc_fixed.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3enc_fixed.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3enc_float.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3enc_float.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3enc_float.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3enc_float.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3enc_opts_template.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3enc_opts_template.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3enc_opts_template.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3enc_opts_template.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3enc_template.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3enc_template.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3enc_template.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3enc_template.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3tab.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3tab.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3tab.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3tab.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3tab.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3tab.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ac3tab.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ac3tab.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/adts_header.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/adts_header.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/adts_header.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/adts_header.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/adts_header.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/adts_header.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/adts_header.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/adts_header.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/adts_parser.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/adts_parser.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/adts_parser.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/adts_parser.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/adts_parser.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/adts_parser.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/adts_parser.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/adts_parser.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/allcodecs.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/allcodecs.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/allcodecs.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/allcodecs.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/audio_frame_queue.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/audio_frame_queue.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/audio_frame_queue.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/audio_frame_queue.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/audio_frame_queue.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/audio_frame_queue.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/audio_frame_queue.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/audio_frame_queue.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/avcodec.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/avcodec.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/avcodec.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/avcodec.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/avdct.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/avdct.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/avdct.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/avdct.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/avdct.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/avdct.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/avdct.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/avdct.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/avfft.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/avfft.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/avfft.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/avfft.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/avfft.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/avfft.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/avfft.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/avfft.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/avpacket.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/avpacket.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/avpacket.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/avpacket.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/avpicture.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/avpicture.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/avpicture.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/avpicture.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/bitstream.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/bitstream.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/bitstream.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/bitstream.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/bitstream_filter.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/bitstream_filter.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/bitstream_filter.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/bitstream_filter.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/bitstream_filters.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/bitstream_filters.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/bitstream_filters.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/bitstream_filters.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/blockdsp.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/blockdsp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/blockdsp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/blockdsp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/blockdsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/blockdsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/blockdsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/blockdsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/bsf.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/bsf.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/bsf.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/bsf.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/bsf.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/bsf.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/bsf.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/bsf.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/bsf_list.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/bsf_list.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/bsf_list.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/bsf_list.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/bytestream.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/bytestream.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/bytestream.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/bytestream.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/cbrt_data.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/cbrt_data.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/cbrt_data.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/cbrt_data.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/cbrt_data.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/cbrt_data.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/cbrt_data.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/cbrt_data.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/cbrt_data_fixed.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/cbrt_data_fixed.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/cbrt_data_fixed.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/cbrt_data_fixed.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/cbrt_tablegen.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/cbrt_tablegen.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/cbrt_tablegen.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/cbrt_tablegen.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/cbrt_tablegen.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/cbrt_tablegen.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/cbrt_tablegen.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/cbrt_tablegen.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/codec_desc.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/codec_desc.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/codec_desc.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/codec_desc.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/codec_list.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/codec_list.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/codec_list.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/codec_list.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/d3d11va.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/d3d11va.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/d3d11va.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/d3d11va.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/d3d11va.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/d3d11va.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/d3d11va.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/d3d11va.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/dct.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/dct.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/dct.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/dct.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/decode.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/decode.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/decode.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/decode.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/decode.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/decode.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/decode.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/decode.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/dirac.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/dirac.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/dirac.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/dirac.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/dirac.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/dirac.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/dirac.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/dirac.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/dirac_arith.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/dirac_arith.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/dirac_arith.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/dirac_arith.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/dirac_dwt.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/dirac_dwt.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/dirac_dwt.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/dirac_dwt.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/dirac_vlc.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/dirac_vlc.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/dirac_vlc.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/dirac_vlc.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/diracdsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/diracdsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/diracdsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/diracdsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/diractab.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/diractab.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/diractab.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/diractab.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/dv_profile.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/dv_profile.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/dv_profile.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/dv_profile.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/dv_profile.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/dv_profile.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/dv_profile.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/dv_profile.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/dv_profile_internal.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/dv_profile_internal.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/dv_profile_internal.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/dv_profile_internal.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/dxva2.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/dxva2.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/dxva2.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/dxva2.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/encode.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/encode.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/encode.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/encode.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/error_resilience.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/error_resilience.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/error_resilience.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/error_resilience.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/error_resilience.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/error_resilience.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/error_resilience.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/error_resilience.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/fdctdsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/fdctdsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/fdctdsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/fdctdsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/fft-internal.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/fft-internal.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/fft-internal.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/fft-internal.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/fft.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/fft.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/fft.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/fft.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/fft_fixed.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/fft_fixed.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/fft_fixed.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/fft_fixed.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/fft_fixed_32.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/fft_fixed_32.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/fft_fixed_32.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/fft_fixed_32.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/fft_float.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/fft_float.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/fft_float.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/fft_float.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/fft_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/fft_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/fft_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/fft_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/fft_init_table.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/fft_init_table.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/fft_init_table.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/fft_init_table.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/fft_table.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/fft_table.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/fft_table.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/fft_table.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/fft_template.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/fft_template.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/fft_template.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/fft_template.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/frame_thread_encoder.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/frame_thread_encoder.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/frame_thread_encoder.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/frame_thread_encoder.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/frame_thread_encoder.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/frame_thread_encoder.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/frame_thread_encoder.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/frame_thread_encoder.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/get_bits.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/get_bits.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/get_bits.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/get_bits.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/golomb.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/golomb.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/golomb.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/golomb.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/golomb.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/golomb.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/golomb.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/golomb.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/h263dsp.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/h263dsp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/h263dsp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/h263dsp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/h263dsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/h263dsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/h263dsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/h263dsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/h264chroma.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/h264chroma.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/h264chroma.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/h264chroma.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/h264chroma.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/h264chroma.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/h264chroma.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/h264chroma.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/hpeldsp.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/hpeldsp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/hpeldsp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/hpeldsp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/hpeldsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/hpeldsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/hpeldsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/hpeldsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/hwaccel.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/hwaccel.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/hwaccel.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/hwaccel.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/hwaccels.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/hwaccels.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/hwaccels.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/hwaccels.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/idctdsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/idctdsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/idctdsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/idctdsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/iirfilter.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/iirfilter.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/iirfilter.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/iirfilter.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/iirfilter.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/iirfilter.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/iirfilter.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/iirfilter.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/imgconvert.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/imgconvert.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/imgconvert.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/imgconvert.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/internal.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/internal.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/internal.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/internal.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/jni.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/jni.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/jni.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/jni.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/jni.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/jni.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/jni.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/jni.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/kbdwin.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/kbdwin.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/kbdwin.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/kbdwin.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/kbdwin.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/kbdwin.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/kbdwin.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/kbdwin.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/latm_parser.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/latm_parser.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/latm_parser.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/latm_parser.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/libopus.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/libopus.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/libopus.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/libopus.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/libopus.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/libopus.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/libopus.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/libopus.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/libopusdec.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/libopusdec.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/libopusdec.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/libopusdec.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/libopusenc.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/libopusenc.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/libopusenc.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/libopusenc.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/lpc.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/lpc.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/lpc.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/lpc.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/lpc.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/lpc.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/lpc.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/lpc.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mathops.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mathops.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mathops.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mathops.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mathtables.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mathtables.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mathtables.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mathtables.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mdct15.asm b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mdct15.asm
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mdct15.asm
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mdct15.asm
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mdct15.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mdct15.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mdct15.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mdct15.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mdct15.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mdct15.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mdct15.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mdct15.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mdct15_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mdct15_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mdct15_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mdct15_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mdct_fixed.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mdct_fixed.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mdct_fixed.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mdct_fixed.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mdct_fixed_32.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mdct_fixed_32.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mdct_fixed_32.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mdct_fixed_32.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mdct_float.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mdct_float.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mdct_float.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mdct_float.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mdct_template.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mdct_template.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mdct_template.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mdct_template.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/me_cmp.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/me_cmp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/me_cmp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/me_cmp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/me_cmp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/me_cmp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/me_cmp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/me_cmp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mediacodec.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mediacodec.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mediacodec.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mediacodec.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mediacodec.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mediacodec.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mediacodec.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mediacodec.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mediacodec_surface.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mediacodec_surface.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mediacodec_surface.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mediacodec_surface.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mediacodec_sw_buffer.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mediacodec_sw_buffer.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mediacodec_sw_buffer.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mediacodec_sw_buffer.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mediacodec_wrapper.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mediacodec_wrapper.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mediacodec_wrapper.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mediacodec_wrapper.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mediacodecdec_common.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mediacodecdec_common.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mediacodecdec_common.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mediacodecdec_common.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mjpegenc.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mjpegenc.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mjpegenc.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mjpegenc.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mjpegenc_common.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mjpegenc_common.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mjpegenc_common.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mjpegenc_common.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mjpegenc_huffman.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mjpegenc_huffman.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mjpegenc_huffman.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mjpegenc_huffman.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mjpegenc_huffman.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mjpegenc_huffman.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mjpegenc_huffman.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mjpegenc_huffman.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/motion_est.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/motion_est.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/motion_est.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/motion_est.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/motion_est.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/motion_est.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/motion_est.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/motion_est.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpeg12.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpeg12.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpeg12.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpeg12.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpeg12.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpeg12.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpeg12.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpeg12.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpeg12data.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpeg12data.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpeg12data.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpeg12data.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpeg12data.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpeg12data.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpeg12data.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpeg12data.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpeg12framerate.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpeg12framerate.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpeg12framerate.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpeg12framerate.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpeg12vlc.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpeg12vlc.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpeg12vlc.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpeg12vlc.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpeg4audio.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpeg4audio.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpeg4audio.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpeg4audio.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpeg4audio.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpeg4audio.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpeg4audio.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpeg4audio.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegpicture.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegpicture.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegpicture.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegpicture.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegpicture.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegpicture.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegpicture.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegpicture.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegutils.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegutils.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegutils.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegutils.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegutils.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegutils.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegutils.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegutils.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegvideo.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegvideo.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegvideo.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegvideo.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegvideo.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegvideo.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegvideo.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegvideo.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegvideodata.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegvideodata.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegvideodata.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegvideodata.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegvideodata.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegvideodata.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegvideodata.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegvideodata.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegvideodsp.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegvideodsp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegvideodsp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegvideodsp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegvideodsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegvideodsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegvideodsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegvideodsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegvideoencdsp.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegvideoencdsp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegvideoencdsp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegvideoencdsp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegvideoencdsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegvideoencdsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/mpegvideoencdsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/mpegvideoencdsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/null_bsf.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/null_bsf.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/null_bsf.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/null_bsf.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/options.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/options.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/options.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/options.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/options_table.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/options_table.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/options_table.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/options_table.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opus.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/opus.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opus.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/opus.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opus.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/opus.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opus.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/opus.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opus_celt.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/opus_celt.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opus_celt.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/opus_celt.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opus_celt.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/opus_celt.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opus_celt.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/opus_celt.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opus_pvq.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/opus_pvq.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opus_pvq.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/opus_pvq.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opus_pvq.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/opus_pvq.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opus_pvq.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/opus_pvq.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opus_rc.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/opus_rc.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opus_rc.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/opus_rc.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opus_rc.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/opus_rc.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opus_rc.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/opus_rc.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opusdsp.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/opusdsp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opusdsp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/opusdsp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opusdsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/opusdsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opusdsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/opusdsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opusenc.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/opusenc.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opusenc.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/opusenc.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opusenc.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/opusenc.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opusenc.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/opusenc.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opusenc_psy.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/opusenc_psy.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opusenc_psy.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/opusenc_psy.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opusenc_psy.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/opusenc_psy.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opusenc_psy.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/opusenc_psy.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opusenc_utils.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/opusenc_utils.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opusenc_utils.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/opusenc_utils.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opustab.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/opustab.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opustab.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/opustab.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opustab.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/opustab.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/opustab.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/opustab.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/parser.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/parser.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/parser.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/parser.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/parser.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/parser.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/parser.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/parser.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/parser_list.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/parser_list.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/parser_list.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/parser_list.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/parsers.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/parsers.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/parsers.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/parsers.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/pixblockdsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/pixblockdsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/pixblockdsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/pixblockdsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/profiles.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/profiles.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/profiles.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/profiles.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/profiles.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/profiles.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/profiles.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/profiles.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/psymodel.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/psymodel.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/psymodel.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/psymodel.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/psymodel.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/psymodel.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/psymodel.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/psymodel.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/pthread.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/pthread.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/pthread.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/pthread.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/pthread_frame.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/pthread_frame.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/pthread_frame.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/pthread_frame.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/pthread_internal.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/pthread_internal.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/pthread_internal.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/pthread_internal.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/pthread_slice.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/pthread_slice.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/pthread_slice.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/pthread_slice.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/put_bits.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/put_bits.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/put_bits.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/put_bits.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/qpeldsp.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/qpeldsp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/qpeldsp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/qpeldsp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/qpeldsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/qpeldsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/qpeldsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/qpeldsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/qsv.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/qsv.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/qsv.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/qsv.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/qsv_api.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/qsv_api.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/qsv_api.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/qsv_api.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ratecontrol.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ratecontrol.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ratecontrol.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ratecontrol.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ratecontrol.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/ratecontrol.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/ratecontrol.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/ratecontrol.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/raw.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/raw.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/raw.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/raw.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/raw.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/raw.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/raw.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/raw.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/rdft.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/rdft.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/rdft.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/rdft.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/rl.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/rl.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/rl.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/rl.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/rl.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/rl.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/rl.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/rl.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/rle.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/rle.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/rle.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/rle.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sbr.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/sbr.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sbr.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/sbr.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sbrdsp.asm b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/sbrdsp.asm
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sbrdsp.asm
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/sbrdsp.asm
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sbrdsp.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/sbrdsp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sbrdsp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/sbrdsp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sbrdsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/sbrdsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sbrdsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/sbrdsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sbrdsp_fixed.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/sbrdsp_fixed.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sbrdsp_fixed.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/sbrdsp_fixed.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sbrdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/sbrdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sbrdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/sbrdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sbrdsp_template.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/sbrdsp_template.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sbrdsp_template.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/sbrdsp_template.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sinewin.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/sinewin.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sinewin.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/sinewin.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sinewin.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/sinewin.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sinewin.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/sinewin.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sinewin_fixed.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/sinewin_fixed.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sinewin_fixed.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/sinewin_fixed.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sinewin_tablegen.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/sinewin_tablegen.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sinewin_tablegen.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/sinewin_tablegen.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sinewin_tablegen.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/sinewin_tablegen.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/sinewin_tablegen.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/sinewin_tablegen.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/thread.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/thread.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/thread.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/thread.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/utils.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/utils.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/utils.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/utils.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/v4l2_buffers.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/v4l2_buffers.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/v4l2_buffers.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/v4l2_buffers.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/v4l2_buffers.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/v4l2_buffers.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/v4l2_buffers.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/v4l2_buffers.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/v4l2_context.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/v4l2_context.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/v4l2_context.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/v4l2_context.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/v4l2_context.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/v4l2_context.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/v4l2_context.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/v4l2_context.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/v4l2_fmt.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/v4l2_fmt.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/v4l2_fmt.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/v4l2_fmt.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/v4l2_fmt.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/v4l2_fmt.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/v4l2_fmt.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/v4l2_fmt.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/v4l2_m2m.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/v4l2_m2m.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/v4l2_m2m.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/v4l2_m2m.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/v4l2_m2m.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/v4l2_m2m.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/v4l2_m2m.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/v4l2_m2m.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vaapi.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/vaapi.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vaapi.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/vaapi.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vdpau.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/vdpau.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vdpau.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/vdpau.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/version.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/version.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/version.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/version.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/videodsp.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/videodsp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/videodsp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/videodsp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/videodsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/videodsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/videodsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/videodsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/videotoolbox.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/videotoolbox.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/videotoolbox.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/videotoolbox.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vlc.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/vlc.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vlc.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/vlc.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vorbis.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/vorbis.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vorbis.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/vorbis.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vorbis.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/vorbis.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vorbis.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/vorbis.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vorbis_data.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/vorbis_data.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vorbis_data.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/vorbis_data.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vorbis_enc_data.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/vorbis_enc_data.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vorbis_enc_data.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/vorbis_enc_data.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vorbis_parser.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/vorbis_parser.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vorbis_parser.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/vorbis_parser.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vorbis_parser.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/vorbis_parser.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vorbis_parser.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/vorbis_parser.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vorbis_parser_internal.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/vorbis_parser_internal.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vorbis_parser_internal.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/vorbis_parser_internal.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vorbisdsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/vorbisdsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/vorbisdsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/vorbisdsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/Makefile b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/Makefile
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/Makefile
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/Makefile
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/aacencdsp.asm b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/aacencdsp.asm
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/aacencdsp.asm
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/aacencdsp.asm
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/aacencdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/aacencdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/aacencdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/aacencdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/aacpsdsp.asm b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/aacpsdsp.asm
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/aacpsdsp.asm
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/aacpsdsp.asm
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/aacpsdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/aacpsdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/aacpsdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/aacpsdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/ac3dsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/ac3dsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/ac3dsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/ac3dsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/alacdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/alacdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/alacdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/alacdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/audiodsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/audiodsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/audiodsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/audiodsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/blockdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/blockdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/blockdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/blockdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/bswapdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/bswapdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/bswapdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/bswapdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/cabac.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/cabac.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/cabac.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/cabac.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/cavsdsp.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/cavsdsp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/cavsdsp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/cavsdsp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/celt_pvq_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/celt_pvq_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/celt_pvq_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/celt_pvq_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/celt_pvq_search.asm b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/celt_pvq_search.asm
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/celt_pvq_search.asm
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/celt_pvq_search.asm
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/constants.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/constants.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/constants.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/constants.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/constants.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/constants.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/constants.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/constants.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/dcadsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/dcadsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/dcadsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/dcadsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/dct_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/dct_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/dct_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/dct_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/dirac_dwt_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/dirac_dwt_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/dirac_dwt_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/dirac_dwt_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/diracdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/diracdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/diracdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/diracdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/dnxhdenc_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/dnxhdenc_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/dnxhdenc_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/dnxhdenc_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/exrdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/exrdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/exrdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/exrdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/fdct.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/fdct.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/fdct.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/fdct.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/fdct.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/fdct.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/fdct.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/fdct.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/fdctdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/fdctdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/fdctdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/fdctdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/fft.asm b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/fft.asm
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/fft.asm
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/fft.asm
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/fft.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/fft.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/fft.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/fft.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/fft_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/fft_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/fft_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/fft_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/flacdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/flacdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/flacdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/flacdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/fmtconvert_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/fmtconvert_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/fmtconvert_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/fmtconvert_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/fpel.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/fpel.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/fpel.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/fpel.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/g722dsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/g722dsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/g722dsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/g722dsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/h263dsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/h263dsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/h263dsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/h263dsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/h264_cabac.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/h264_cabac.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/h264_cabac.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/h264_cabac.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/h264_intrapred_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/h264_intrapred_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/h264_intrapred_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/h264_intrapred_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/h264_qpel.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/h264_qpel.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/h264_qpel.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/h264_qpel.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/h264chroma_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/h264chroma_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/h264chroma_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/h264chroma_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/h264dsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/h264dsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/h264dsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/h264dsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/hevcdsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/hevcdsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/hevcdsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/hevcdsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/hevcdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/hevcdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/hevcdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/hevcdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/hpeldsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/hpeldsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/hpeldsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/hpeldsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/hpeldsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/hpeldsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/hpeldsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/hpeldsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/hpeldsp_rnd_template.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/hpeldsp_rnd_template.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/hpeldsp_rnd_template.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/hpeldsp_rnd_template.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/hpeldsp_vp3_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/hpeldsp_vp3_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/hpeldsp_vp3_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/hpeldsp_vp3_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/huffyuvdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/huffyuvdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/huffyuvdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/huffyuvdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/huffyuvencdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/huffyuvencdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/huffyuvencdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/huffyuvencdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/idctdsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/idctdsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/idctdsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/idctdsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/idctdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/idctdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/idctdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/idctdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/inline_asm.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/inline_asm.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/inline_asm.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/inline_asm.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/jpeg2000dsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/jpeg2000dsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/jpeg2000dsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/jpeg2000dsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/lossless_audiodsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/lossless_audiodsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/lossless_audiodsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/lossless_audiodsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/lossless_videodsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/lossless_videodsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/lossless_videodsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/lossless_videodsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/lossless_videoencdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/lossless_videoencdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/lossless_videoencdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/lossless_videoencdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/lpc.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/lpc.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/lpc.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/lpc.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mathops.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mathops.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mathops.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mathops.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mdct15.asm b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mdct15.asm
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mdct15.asm
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mdct15.asm
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mdct15_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mdct15_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mdct15_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mdct15_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/me_cmp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/me_cmp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/me_cmp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/me_cmp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mlpdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mlpdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mlpdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mlpdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mpegaudiodsp.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mpegaudiodsp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mpegaudiodsp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mpegaudiodsp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mpegvideo.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mpegvideo.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mpegvideo.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mpegvideo.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mpegvideodsp.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mpegvideodsp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mpegvideodsp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mpegvideodsp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mpegvideoenc.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mpegvideoenc.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mpegvideoenc.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mpegvideoenc.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mpegvideoenc_qns_template.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mpegvideoenc_qns_template.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mpegvideoenc_qns_template.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mpegvideoenc_qns_template.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mpegvideoenc_template.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mpegvideoenc_template.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mpegvideoenc_template.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mpegvideoenc_template.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mpegvideoencdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mpegvideoencdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/mpegvideoencdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/mpegvideoencdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/opusdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/opusdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/opusdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/opusdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/pixblockdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/pixblockdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/pixblockdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/pixblockdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/pngdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/pngdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/pngdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/pngdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/proresdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/proresdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/proresdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/proresdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/qpeldsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/qpeldsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/qpeldsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/qpeldsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/rnd_template.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/rnd_template.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/rnd_template.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/rnd_template.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/rv34dsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/rv34dsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/rv34dsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/rv34dsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/rv40dsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/rv40dsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/rv40dsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/rv40dsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/sbcdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/sbcdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/sbcdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/sbcdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/sbrdsp.asm b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/sbrdsp.asm
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/sbrdsp.asm
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/sbrdsp.asm
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/sbrdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/sbrdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/sbrdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/sbrdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/simple_idct.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/simple_idct.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/simple_idct.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/simple_idct.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/snowdsp.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/snowdsp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/snowdsp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/snowdsp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/svq1enc_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/svq1enc_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/svq1enc_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/svq1enc_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/synth_filter_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/synth_filter_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/synth_filter_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/synth_filter_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/takdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/takdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/takdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/takdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/ttadsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/ttadsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/ttadsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/ttadsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/ttaencdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/ttaencdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/ttaencdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/ttaencdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/utvideodsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/utvideodsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/utvideodsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/utvideodsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/v210-init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/v210-init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/v210-init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/v210-init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/v210enc_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/v210enc_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/v210enc_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/v210enc_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vc1dsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vc1dsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vc1dsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vc1dsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vc1dsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vc1dsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vc1dsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vc1dsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vc1dsp_mmx.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vc1dsp_mmx.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vc1dsp_mmx.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vc1dsp_mmx.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/videodsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/videodsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/videodsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/videodsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vorbisdsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vorbisdsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vorbisdsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vorbisdsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vp3dsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vp3dsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vp3dsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vp3dsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vp56_arith.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vp56_arith.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vp56_arith.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vp56_arith.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vp6dsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vp6dsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vp6dsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vp6dsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vp8dsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vp8dsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vp8dsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vp8dsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vp9dsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vp9dsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vp9dsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vp9dsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vp9dsp_init.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vp9dsp_init.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vp9dsp_init.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vp9dsp_init.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vp9dsp_init_10bpp.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vp9dsp_init_10bpp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vp9dsp_init_10bpp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vp9dsp_init_10bpp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vp9dsp_init_12bpp.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vp9dsp_init_12bpp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vp9dsp_init_12bpp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vp9dsp_init_12bpp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vp9dsp_init_16bpp.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vp9dsp_init_16bpp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vp9dsp_init_16bpp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vp9dsp_init_16bpp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vp9dsp_init_16bpp_template.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vp9dsp_init_16bpp_template.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/vp9dsp_init_16bpp_template.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/vp9dsp_init_16bpp_template.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/xvididct.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/xvididct.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/xvididct.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/xvididct.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/xvididct_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/xvididct_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/x86/xvididct_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/x86/xvididct_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/xiph.c b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/xiph.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/xiph.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/xiph.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/xiph.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/xiph.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/xiph.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/xiph.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/xvmc.h b/trunk/3rdparty/ffmpeg-4-fit/libavcodec/xvmc.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavcodec/xvmc.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavcodec/xvmc.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavdevice/alldevices.c b/trunk/3rdparty/ffmpeg-4-fit/libavdevice/alldevices.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavdevice/alldevices.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavdevice/alldevices.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavdevice/indev_list.c b/trunk/3rdparty/ffmpeg-4-fit/libavdevice/indev_list.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavdevice/indev_list.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavdevice/indev_list.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavdevice/outdev_list.c b/trunk/3rdparty/ffmpeg-4-fit/libavdevice/outdev_list.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavdevice/outdev_list.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavdevice/outdev_list.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavfilter/allfilters.c b/trunk/3rdparty/ffmpeg-4-fit/libavfilter/allfilters.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavfilter/allfilters.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavfilter/allfilters.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavfilter/avfilter.h b/trunk/3rdparty/ffmpeg-4-fit/libavfilter/avfilter.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavfilter/avfilter.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavfilter/avfilter.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavfilter/bufferqueue.h b/trunk/3rdparty/ffmpeg-4-fit/libavfilter/bufferqueue.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavfilter/bufferqueue.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavfilter/bufferqueue.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavfilter/filter_list.c b/trunk/3rdparty/ffmpeg-4-fit/libavfilter/filter_list.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavfilter/filter_list.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavfilter/filter_list.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavfilter/version.h b/trunk/3rdparty/ffmpeg-4-fit/libavfilter/version.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavfilter/version.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavfilter/version.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavfilter/window_func.h b/trunk/3rdparty/ffmpeg-4-fit/libavfilter/window_func.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavfilter/window_func.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavfilter/window_func.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavformat/allformats.c b/trunk/3rdparty/ffmpeg-4-fit/libavformat/allformats.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavformat/allformats.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavformat/allformats.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavformat/demuxer_list.c b/trunk/3rdparty/ffmpeg-4-fit/libavformat/demuxer_list.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavformat/demuxer_list.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavformat/demuxer_list.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavformat/muxer_list.c b/trunk/3rdparty/ffmpeg-4-fit/libavformat/muxer_list.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavformat/muxer_list.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavformat/muxer_list.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavformat/protocol_list.c b/trunk/3rdparty/ffmpeg-4-fit/libavformat/protocol_list.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavformat/protocol_list.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavformat/protocol_list.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavformat/protocols.c b/trunk/3rdparty/ffmpeg-4-fit/libavformat/protocols.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavformat/protocols.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavformat/protocols.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/Makefile b/trunk/3rdparty/ffmpeg-4-fit/libavutil/Makefile
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/Makefile
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/Makefile
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aarch64/Makefile b/trunk/3rdparty/ffmpeg-4-fit/libavutil/aarch64/Makefile
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aarch64/Makefile
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/aarch64/Makefile
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aarch64/bswap.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/aarch64/bswap.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aarch64/bswap.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/aarch64/bswap.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aarch64/cpu.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/aarch64/cpu.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aarch64/cpu.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/aarch64/cpu.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aarch64/cpu.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/aarch64/cpu.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aarch64/cpu.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/aarch64/cpu.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aarch64/float_dsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/aarch64/float_dsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aarch64/float_dsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/aarch64/float_dsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aarch64/neontest.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/aarch64/neontest.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aarch64/neontest.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/aarch64/neontest.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aarch64/timer.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/aarch64/timer.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aarch64/timer.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/aarch64/timer.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/adler32.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/adler32.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/adler32.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/adler32.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/adler32.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/adler32.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/adler32.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/adler32.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aes.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/aes.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aes.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/aes.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aes.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/aes.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aes.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/aes.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aes_ctr.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/aes_ctr.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aes_ctr.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/aes_ctr.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aes_ctr.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/aes_ctr.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aes_ctr.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/aes_ctr.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aes_internal.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/aes_internal.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/aes_internal.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/aes_internal.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/Makefile b/trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/Makefile
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/Makefile
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/Makefile
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/bswap.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/bswap.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/bswap.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/bswap.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/cpu.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/cpu.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/cpu.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/cpu.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/cpu.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/cpu.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/cpu.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/cpu.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/float_dsp_arm.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/float_dsp_arm.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/float_dsp_arm.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/float_dsp_arm.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/float_dsp_init_arm.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/float_dsp_init_arm.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/float_dsp_init_arm.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/float_dsp_init_arm.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/float_dsp_init_neon.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/float_dsp_init_neon.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/float_dsp_init_neon.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/float_dsp_init_neon.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/float_dsp_init_vfp.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/float_dsp_init_vfp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/float_dsp_init_vfp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/float_dsp_init_vfp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/intmath.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/intmath.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/intmath.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/intmath.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/intreadwrite.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/intreadwrite.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/intreadwrite.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/intreadwrite.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/neontest.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/neontest.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/neontest.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/neontest.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/timer.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/timer.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/arm/timer.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/arm/timer.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/attributes.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/attributes.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/attributes.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/attributes.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/audio_fifo.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/audio_fifo.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/audio_fifo.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/audio_fifo.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/audio_fifo.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/audio_fifo.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/audio_fifo.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/audio_fifo.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/avassert.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/avassert.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/avassert.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/avassert.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/avsscanf.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/avsscanf.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/avsscanf.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/avsscanf.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/avstring.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/avstring.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/avstring.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/avstring.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/avstring.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/avstring.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/avstring.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/avstring.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/avutil.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/avutil.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/avutil.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/avutil.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/avutilres.rc b/trunk/3rdparty/ffmpeg-4-fit/libavutil/avutilres.rc
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/avutilres.rc
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/avutilres.rc
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/base64.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/base64.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/base64.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/base64.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/base64.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/base64.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/base64.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/base64.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/blowfish.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/blowfish.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/blowfish.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/blowfish.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/blowfish.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/blowfish.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/blowfish.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/blowfish.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/bprint.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/bprint.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/bprint.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/bprint.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/bprint.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/bprint.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/bprint.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/bprint.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/bswap.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/bswap.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/bswap.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/bswap.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/buffer.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/buffer.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/buffer.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/buffer.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/buffer.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/buffer.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/buffer.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/buffer.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/buffer_internal.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/buffer_internal.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/buffer_internal.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/buffer_internal.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/camellia.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/camellia.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/camellia.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/camellia.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/camellia.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/camellia.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/camellia.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/camellia.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/cast5.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/cast5.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/cast5.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/cast5.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/cast5.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/cast5.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/cast5.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/cast5.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/channel_layout.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/channel_layout.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/channel_layout.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/channel_layout.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/channel_layout.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/channel_layout.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/channel_layout.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/channel_layout.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/color_utils.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/color_utils.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/color_utils.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/color_utils.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/color_utils.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/color_utils.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/color_utils.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/color_utils.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/colorspace.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/colorspace.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/colorspace.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/colorspace.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/common.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/common.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/common.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/common.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/cpu.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/cpu.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/cpu.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/cpu.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/cpu.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/cpu.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/cpu.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/cpu.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/cpu_internal.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/cpu_internal.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/cpu_internal.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/cpu_internal.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/crc.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/crc.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/crc.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/crc.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/crc.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/crc.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/crc.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/crc.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/des.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/des.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/des.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/des.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/des.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/des.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/des.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/des.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/dict.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/dict.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/dict.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/dict.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/dict.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/dict.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/dict.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/dict.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/display.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/display.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/display.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/display.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/display.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/display.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/display.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/display.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/downmix_info.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/downmix_info.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/downmix_info.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/downmix_info.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/downmix_info.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/downmix_info.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/downmix_info.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/downmix_info.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/dynarray.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/dynarray.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/dynarray.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/dynarray.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/encryption_info.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/encryption_info.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/encryption_info.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/encryption_info.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/encryption_info.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/encryption_info.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/encryption_info.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/encryption_info.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/error.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/error.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/error.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/error.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/error.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/error.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/error.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/error.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/eval.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/eval.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/eval.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/eval.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/eval.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/eval.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/eval.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/eval.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/ffmath.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/ffmath.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/ffmath.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/ffmath.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/fifo.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/fifo.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/fifo.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/fifo.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/fifo.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/fifo.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/fifo.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/fifo.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/file.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/file.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/file.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/file.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/file.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/file.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/file.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/file.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/file_open.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/file_open.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/file_open.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/file_open.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/fixed_dsp.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/fixed_dsp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/fixed_dsp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/fixed_dsp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/fixed_dsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/fixed_dsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/fixed_dsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/fixed_dsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/float_dsp.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/float_dsp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/float_dsp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/float_dsp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/float_dsp.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/float_dsp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/float_dsp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/float_dsp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/frame.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/frame.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/frame.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/frame.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/frame.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/frame.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/frame.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/frame.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hash.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hash.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hash.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hash.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hash.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hash.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hash.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hash.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hdr_dynamic_metadata.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hdr_dynamic_metadata.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hdr_dynamic_metadata.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hdr_dynamic_metadata.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hdr_dynamic_metadata.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hdr_dynamic_metadata.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hdr_dynamic_metadata.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hdr_dynamic_metadata.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hmac.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hmac.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hmac.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hmac.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hmac.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hmac.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hmac.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hmac.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_cuda.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_cuda.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_cuda.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_cuda.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_cuda.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_cuda.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_cuda.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_cuda.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_cuda_internal.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_cuda_internal.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_cuda_internal.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_cuda_internal.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_d3d11va.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_d3d11va.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_d3d11va.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_d3d11va.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_d3d11va.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_d3d11va.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_d3d11va.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_d3d11va.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_drm.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_drm.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_drm.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_drm.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_drm.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_drm.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_drm.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_drm.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_dxva2.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_dxva2.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_dxva2.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_dxva2.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_dxva2.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_dxva2.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_dxva2.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_dxva2.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_internal.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_internal.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_internal.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_internal.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_mediacodec.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_mediacodec.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_mediacodec.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_mediacodec.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_mediacodec.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_mediacodec.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_mediacodec.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_mediacodec.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_opencl.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_opencl.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_opencl.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_opencl.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_opencl.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_opencl.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_opencl.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_opencl.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_qsv.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_qsv.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_qsv.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_qsv.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_qsv.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_qsv.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_qsv.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_qsv.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_vaapi.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_vaapi.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_vaapi.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_vaapi.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_vaapi.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_vaapi.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_vaapi.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_vaapi.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_vdpau.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_vdpau.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_vdpau.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_vdpau.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_vdpau.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_vdpau.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_vdpau.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_vdpau.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_videotoolbox.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_videotoolbox.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_videotoolbox.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_videotoolbox.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_videotoolbox.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_videotoolbox.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/hwcontext_videotoolbox.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/hwcontext_videotoolbox.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/imgutils.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/imgutils.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/imgutils.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/imgutils.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/imgutils.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/imgutils.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/imgutils.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/imgutils.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/imgutils_internal.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/imgutils_internal.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/imgutils_internal.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/imgutils_internal.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/integer.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/integer.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/integer.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/integer.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/integer.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/integer.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/integer.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/integer.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/internal.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/internal.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/internal.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/internal.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/intfloat.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/intfloat.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/intfloat.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/intfloat.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/intmath.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/intmath.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/intmath.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/intmath.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/intmath.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/intmath.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/intmath.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/intmath.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/intreadwrite.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/intreadwrite.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/intreadwrite.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/intreadwrite.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/lfg.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/lfg.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/lfg.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/lfg.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/lfg.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/lfg.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/lfg.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/lfg.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/libm.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/libm.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/libm.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/libm.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/lls.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/lls.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/lls.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/lls.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/lls.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/lls.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/lls.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/lls.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/log.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/log.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/log.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/log.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/log.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/log.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/log.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/log.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/log2_tab.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/log2_tab.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/log2_tab.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/log2_tab.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/macros.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/macros.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/macros.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/macros.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/mastering_display_metadata.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/mastering_display_metadata.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/mastering_display_metadata.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/mastering_display_metadata.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/mastering_display_metadata.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/mastering_display_metadata.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/mastering_display_metadata.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/mastering_display_metadata.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/mathematics.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/mathematics.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/mathematics.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/mathematics.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/mathematics.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/mathematics.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/mathematics.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/mathematics.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/md5.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/md5.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/md5.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/md5.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/md5.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/md5.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/md5.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/md5.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/mem.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/mem.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/mem.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/mem.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/mem.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/mem.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/mem.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/mem.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/mem_internal.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/mem_internal.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/mem_internal.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/mem_internal.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/motion_vector.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/motion_vector.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/motion_vector.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/motion_vector.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/murmur3.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/murmur3.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/murmur3.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/murmur3.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/murmur3.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/murmur3.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/murmur3.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/murmur3.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/opt.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/opt.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/opt.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/opt.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/opt.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/opt.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/opt.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/opt.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/parseutils.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/parseutils.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/parseutils.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/parseutils.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/parseutils.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/parseutils.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/parseutils.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/parseutils.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/pixdesc.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/pixdesc.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/pixdesc.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/pixdesc.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/pixdesc.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/pixdesc.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/pixdesc.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/pixdesc.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/pixelutils.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/pixelutils.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/pixelutils.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/pixelutils.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/pixelutils.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/pixelutils.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/pixelutils.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/pixelutils.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/pixfmt.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/pixfmt.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/pixfmt.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/pixfmt.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/qsort.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/qsort.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/qsort.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/qsort.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/random_seed.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/random_seed.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/random_seed.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/random_seed.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/random_seed.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/random_seed.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/random_seed.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/random_seed.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/rational.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/rational.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/rational.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/rational.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/rational.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/rational.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/rational.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/rational.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/rc4.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/rc4.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/rc4.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/rc4.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/rc4.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/rc4.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/rc4.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/rc4.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/replaygain.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/replaygain.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/replaygain.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/replaygain.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/reverse.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/reverse.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/reverse.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/reverse.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/reverse.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/reverse.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/reverse.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/reverse.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/ripemd.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/ripemd.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/ripemd.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/ripemd.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/ripemd.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/ripemd.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/ripemd.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/ripemd.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/samplefmt.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/samplefmt.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/samplefmt.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/samplefmt.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/samplefmt.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/samplefmt.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/samplefmt.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/samplefmt.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/sha.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/sha.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/sha.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/sha.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/sha.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/sha.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/sha.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/sha.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/sha512.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/sha512.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/sha512.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/sha512.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/sha512.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/sha512.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/sha512.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/sha512.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/slicethread.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/slicethread.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/slicethread.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/slicethread.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/slicethread.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/slicethread.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/slicethread.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/slicethread.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/softfloat.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/softfloat.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/softfloat.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/softfloat.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/softfloat_ieee754.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/softfloat_ieee754.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/softfloat_ieee754.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/softfloat_ieee754.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/softfloat_tables.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/softfloat_tables.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/softfloat_tables.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/softfloat_tables.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/spherical.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/spherical.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/spherical.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/spherical.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/spherical.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/spherical.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/spherical.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/spherical.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/stereo3d.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/stereo3d.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/stereo3d.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/stereo3d.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/stereo3d.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/stereo3d.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/stereo3d.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/stereo3d.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/tea.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/tea.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/tea.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/tea.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/tea.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/tea.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/tea.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/tea.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/thread.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/thread.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/thread.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/thread.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/threadmessage.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/threadmessage.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/threadmessage.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/threadmessage.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/threadmessage.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/threadmessage.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/threadmessage.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/threadmessage.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/time.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/time.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/time.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/time.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/time.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/time.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/time.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/time.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/time_internal.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/time_internal.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/time_internal.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/time_internal.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/timecode.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/timecode.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/timecode.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/timecode.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/timecode.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/timecode.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/timecode.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/timecode.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/timer.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/timer.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/timer.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/timer.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/timestamp.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/timestamp.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/timestamp.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/timestamp.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/tree.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/tree.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/tree.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/tree.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/tree.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/tree.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/tree.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/tree.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/twofish.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/twofish.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/twofish.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/twofish.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/twofish.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/twofish.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/twofish.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/twofish.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/tx.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/tx.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/tx.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/tx.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/tx.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/tx.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/tx.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/tx.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/utils.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/utils.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/utils.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/utils.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/version.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/version.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/version.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/version.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/Makefile b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/Makefile
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/Makefile
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/Makefile
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/asm.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/asm.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/asm.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/asm.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/bswap.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/bswap.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/bswap.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/bswap.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/cpu.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/cpu.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/cpu.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/cpu.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/cpu.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/cpu.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/cpu.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/cpu.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/cpuid.asm b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/cpuid.asm
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/cpuid.asm
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/cpuid.asm
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/emms.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/emms.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/emms.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/emms.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/fixed_dsp.asm b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/fixed_dsp.asm
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/fixed_dsp.asm
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/fixed_dsp.asm
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/fixed_dsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/fixed_dsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/fixed_dsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/fixed_dsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/float_dsp.asm b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/float_dsp.asm
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/float_dsp.asm
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/float_dsp.asm
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/float_dsp_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/float_dsp_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/float_dsp_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/float_dsp_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/imgutils.asm b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/imgutils.asm
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/imgutils.asm
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/imgutils.asm
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/imgutils_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/imgutils_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/imgutils_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/imgutils_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/intmath.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/intmath.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/intmath.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/intmath.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/intreadwrite.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/intreadwrite.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/intreadwrite.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/intreadwrite.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/lls.asm b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/lls.asm
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/lls.asm
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/lls.asm
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/lls_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/lls_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/lls_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/lls_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/pixelutils.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/pixelutils.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/pixelutils.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/pixelutils.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/pixelutils_init.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/pixelutils_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/pixelutils_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/pixelutils_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/timer.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/timer.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/timer.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/timer.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/w64xmmtest.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/w64xmmtest.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/w64xmmtest.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/w64xmmtest.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/x86inc.asm b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/x86inc.asm
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/x86inc.asm
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/x86inc.asm
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/x86util.asm b/trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/x86util.asm
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/x86/x86util.asm
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/x86/x86util.asm
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/xga_font_data.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/xga_font_data.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/xga_font_data.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/xga_font_data.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/xga_font_data.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/xga_font_data.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/xga_font_data.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/xga_font_data.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/xtea.c b/trunk/3rdparty/ffmpeg-4-fit/libavutil/xtea.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/xtea.c
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/xtea.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libavutil/xtea.h b/trunk/3rdparty/ffmpeg-4-fit/libavutil/xtea.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libavutil/xtea.h
rename to trunk/3rdparty/ffmpeg-4-fit/libavutil/xtea.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/Makefile b/trunk/3rdparty/ffmpeg-4-fit/libswresample/Makefile
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/Makefile
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/Makefile
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/aarch64/Makefile b/trunk/3rdparty/ffmpeg-4-fit/libswresample/aarch64/Makefile
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/aarch64/Makefile
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/aarch64/Makefile
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/aarch64/audio_convert_init.c b/trunk/3rdparty/ffmpeg-4-fit/libswresample/aarch64/audio_convert_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/aarch64/audio_convert_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/aarch64/audio_convert_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/aarch64/resample_init.c b/trunk/3rdparty/ffmpeg-4-fit/libswresample/aarch64/resample_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/aarch64/resample_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/aarch64/resample_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/arm/Makefile b/trunk/3rdparty/ffmpeg-4-fit/libswresample/arm/Makefile
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/arm/Makefile
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/arm/Makefile
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/arm/audio_convert_init.c b/trunk/3rdparty/ffmpeg-4-fit/libswresample/arm/audio_convert_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/arm/audio_convert_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/arm/audio_convert_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/arm/resample_init.c b/trunk/3rdparty/ffmpeg-4-fit/libswresample/arm/resample_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/arm/resample_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/arm/resample_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/audioconvert.c b/trunk/3rdparty/ffmpeg-4-fit/libswresample/audioconvert.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/audioconvert.c
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/audioconvert.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/audioconvert.h b/trunk/3rdparty/ffmpeg-4-fit/libswresample/audioconvert.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/audioconvert.h
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/audioconvert.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/dither.c b/trunk/3rdparty/ffmpeg-4-fit/libswresample/dither.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/dither.c
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/dither.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/dither_template.c b/trunk/3rdparty/ffmpeg-4-fit/libswresample/dither_template.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/dither_template.c
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/dither_template.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/noise_shaping_data.c b/trunk/3rdparty/ffmpeg-4-fit/libswresample/noise_shaping_data.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/noise_shaping_data.c
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/noise_shaping_data.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/options.c b/trunk/3rdparty/ffmpeg-4-fit/libswresample/options.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/options.c
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/options.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/rematrix.c b/trunk/3rdparty/ffmpeg-4-fit/libswresample/rematrix.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/rematrix.c
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/rematrix.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/rematrix_template.c b/trunk/3rdparty/ffmpeg-4-fit/libswresample/rematrix_template.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/rematrix_template.c
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/rematrix_template.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/resample.c b/trunk/3rdparty/ffmpeg-4-fit/libswresample/resample.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/resample.c
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/resample.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/resample.h b/trunk/3rdparty/ffmpeg-4-fit/libswresample/resample.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/resample.h
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/resample.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/resample_dsp.c b/trunk/3rdparty/ffmpeg-4-fit/libswresample/resample_dsp.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/resample_dsp.c
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/resample_dsp.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/resample_template.c b/trunk/3rdparty/ffmpeg-4-fit/libswresample/resample_template.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/resample_template.c
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/resample_template.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/swresample.c b/trunk/3rdparty/ffmpeg-4-fit/libswresample/swresample.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/swresample.c
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/swresample.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/swresample.h b/trunk/3rdparty/ffmpeg-4-fit/libswresample/swresample.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/swresample.h
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/swresample.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/swresample_frame.c b/trunk/3rdparty/ffmpeg-4-fit/libswresample/swresample_frame.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/swresample_frame.c
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/swresample_frame.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/swresample_internal.h b/trunk/3rdparty/ffmpeg-4-fit/libswresample/swresample_internal.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/swresample_internal.h
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/swresample_internal.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/swresampleres.rc b/trunk/3rdparty/ffmpeg-4-fit/libswresample/swresampleres.rc
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/swresampleres.rc
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/swresampleres.rc
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/version.h b/trunk/3rdparty/ffmpeg-4-fit/libswresample/version.h
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/version.h
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/version.h
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/x86/Makefile b/trunk/3rdparty/ffmpeg-4-fit/libswresample/x86/Makefile
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/x86/Makefile
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/x86/Makefile
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/x86/audio_convert.asm b/trunk/3rdparty/ffmpeg-4-fit/libswresample/x86/audio_convert.asm
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/x86/audio_convert.asm
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/x86/audio_convert.asm
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/x86/audio_convert_init.c b/trunk/3rdparty/ffmpeg-4-fit/libswresample/x86/audio_convert_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/x86/audio_convert_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/x86/audio_convert_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/x86/rematrix.asm b/trunk/3rdparty/ffmpeg-4-fit/libswresample/x86/rematrix.asm
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/x86/rematrix.asm
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/x86/rematrix.asm
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/x86/rematrix_init.c b/trunk/3rdparty/ffmpeg-4-fit/libswresample/x86/rematrix_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/x86/rematrix_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/x86/rematrix_init.c
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/x86/resample.asm b/trunk/3rdparty/ffmpeg-4-fit/libswresample/x86/resample.asm
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/x86/resample.asm
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/x86/resample.asm
diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/libswresample/x86/resample_init.c b/trunk/3rdparty/ffmpeg-4-fit/libswresample/x86/resample_init.c
similarity index 100%
rename from trunk/3rdparty/ffmpeg-4.2-fit/libswresample/x86/resample_init.c
rename to trunk/3rdparty/ffmpeg-4-fit/libswresample/x86/resample_init.c
diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh
index 793a1b59d..23ec86081 100755
--- a/trunk/auto/depends.sh
+++ b/trunk/auto/depends.sh
@@ -572,9 +572,9 @@ if [[ $SRS_SRTP_ASM == YES ]]; then
 fi
 # Patched ST from https://github.com/ossrs/state-threads/tree/srs
 if [[ -f ${SRS_OBJS}/${SRS_PLATFORM}/libsrtp-2-fit/_release/lib/libsrtp2.a ]]; then
-    echo "The srtp2 is ok.";
+    echo "The libsrtp-2-fit is ok.";
 else
-    echo "Building srtp2.";
+    echo "Building libsrtp-2-fit.";
     (
         rm -rf ${SRS_OBJS}/srtp2 && cd ${SRS_OBJS}/${SRS_PLATFORM} &&
         rm -rf libsrtp-2-fit && cp -R ../../3rdparty/libsrtp-2-fit . && cd libsrtp-2-fit &&
@@ -584,11 +584,11 @@ else
     )
 fi
 # check status
-ret=$?; if [[ $ret -ne 0 ]]; then echo "Build srtp2 failed, ret=$ret"; exit $ret; fi
+ret=$?; if [[ $ret -ne 0 ]]; then echo "Build libsrtp-2-fit failed, ret=$ret"; exit $ret; fi
 # Always update the links.
 (cd ${SRS_OBJS}/${SRS_PLATFORM} && rm -rf srtp2 && ln -sf libsrtp-2-fit/_release srtp2)
 (cd ${SRS_OBJS} && rm -rf srtp2 && ln -sf ${SRS_PLATFORM}/libsrtp-2-fit/_release srtp2)
-if [ ! -f ${SRS_OBJS}/srtp2/lib/libsrtp2.a ]; then echo "Build srtp2 static lib failed."; exit -1; fi
+if [ ! -f ${SRS_OBJS}/srtp2/lib/libsrtp2.a ]; then echo "Build libsrtp-2-fit static lib failed."; exit -1; fi
 
 #####################################################################################
 # libopus, for WebRTC to transcode AAC with Opus.
@@ -628,14 +628,14 @@ if [[ $SRS_FFMPEG_FIT == YES ]]; then
         FFMPEG_OPTIONS="--disable-x86asm"
     fi
 
-    if [[ -f ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg-4.2-fit/_release/lib/libavcodec.a ]]; then
-        echo "The ffmpeg-4.2-fit is ok.";
+    if [[ -f ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg-4-fit/_release/lib/libavcodec.a ]]; then
+        echo "The ffmpeg-4-fit is ok.";
     else
-        echo "Building ffmpeg-4.2-fit.";
+        echo "Building ffmpeg-4-fit.";
         (
-            rm -rf ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg-4.2-fit && mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg-4.2-fit &&
+            rm -rf ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg-4-fit && mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg-4-fit &&
             # Create a hidden directory .src
-            cd ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg-4.2-fit && cp -R ../../../3rdparty/ffmpeg-4.2-fit/* . &&
+            cd ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg-4-fit && cp -R ../../../3rdparty/ffmpeg-4-fit/* . &&
             # For libopus and other codecs.
             ABS_OBJS=$(cd .. && pwd) &&
             # Build source code.
@@ -651,15 +651,15 @@ if [[ $SRS_FFMPEG_FIT == YES ]]; then
               --disable-lzma --disable-sdl2 --disable-everything --enable-decoder=aac --enable-decoder=aac_fixed --enable-decoder=aac_latm \
               --enable-decoder=libopus --enable-encoder=aac --enable-encoder=opus --enable-encoder=libopus --enable-libopus &&
             make ${SRS_JOBS} && make install &&
-            cd .. && rm -rf ffmpeg && ln -sf ffmpeg-4.2-fit/_release ffmpeg
+            cd .. && rm -rf ffmpeg && ln -sf ffmpeg-4-fit/_release ffmpeg
         )
     fi
     # check status
-    ret=$?; if [[ $ret -ne 0 ]]; then echo "Build ffmpeg-4.2-fit failed, ret=$ret"; exit $ret; fi
+    ret=$?; if [[ $ret -ne 0 ]]; then echo "Build ffmpeg-4-fit failed, ret=$ret"; exit $ret; fi
     # Always update the links.
-    (cd ${SRS_OBJS}/${SRS_PLATFORM} && rm -rf ffmpeg && ln -sf ffmpeg-4.2-fit/_release ffmpeg)
-    (cd ${SRS_OBJS} && rm -rf ffmpeg && ln -sf ${SRS_PLATFORM}/ffmpeg-4.2-fit/_release ffmpeg)
-    if [ ! -f ${SRS_OBJS}/ffmpeg/lib/libavcodec.a ]; then echo "Build ffmpeg-4.2-fit failed."; exit -1; fi
+    (cd ${SRS_OBJS}/${SRS_PLATFORM} && rm -rf ffmpeg && ln -sf ffmpeg-4-fit/_release ffmpeg)
+    (cd ${SRS_OBJS} && rm -rf ffmpeg && ln -sf ${SRS_PLATFORM}/ffmpeg-4-fit/_release ffmpeg)
+    if [ ! -f ${SRS_OBJS}/ffmpeg/lib/libavcodec.a ]; then echo "Build ffmpeg-4-fit failed."; exit -1; fi
 fi
 
 #####################################################################################