diff --git a/ffmpegdemo/ffmpeg/ffmpeg4/include64/libavutil/ffversion.h b/ffmpegdemo/ffmpeg/ffmpeg4/include64/libavutil/ffversion.h index 4690884..7a1e981 100644 --- a/ffmpegdemo/ffmpeg/ffmpeg4/include64/libavutil/ffversion.h +++ b/ffmpegdemo/ffmpeg/ffmpeg4/include64/libavutil/ffversion.h @@ -1,5 +1,5 @@ /* Automatically generated by version.sh, do not manually edit! */ #ifndef AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H -#define FFMPEG_VERSION "4.2.1" +#define FFMPEG_VERSION "4.2.3" #endif /* AVUTIL_FFVERSION_H */ diff --git a/ffmpegdemo/ffmpeg/ffmpeg4/include64/libavutil/lfg.h b/ffmpegdemo/ffmpeg/ffmpeg4/include64/libavutil/lfg.h index 03f779a..2b66920 100644 --- a/ffmpegdemo/ffmpeg/ffmpeg4/include64/libavutil/lfg.h +++ b/ffmpegdemo/ffmpeg/ffmpeg4/include64/libavutil/lfg.h @@ -24,6 +24,12 @@ #include +/** + * Context structure for the Lagged Fibonacci PRNG. + * The exact layout, types and content of this struct may change and should + * not be accessed directly. Only its sizeof() is guranteed to stay the same + * to allow easy instanciation. + */ typedef struct AVLFG { unsigned int state[64]; int index; @@ -45,8 +51,9 @@ int av_lfg_init_from_data(AVLFG *c, const uint8_t *data, unsigned int length); * it may be good enough and faster for your specific use case. */ static inline unsigned int av_lfg_get(AVLFG *c){ - c->state[c->index & 63] = c->state[(c->index-24) & 63] + c->state[(c->index-55) & 63]; - return c->state[c->index++ & 63]; + unsigned a = c->state[c->index & 63] = c->state[(c->index-24) & 63] + c->state[(c->index-55) & 63]; + c->index += 1U; + return a; } /** @@ -57,7 +64,9 @@ static inline unsigned int av_lfg_get(AVLFG *c){ static inline unsigned int av_mlfg_get(AVLFG *c){ unsigned int a= c->state[(c->index-55) & 63]; unsigned int b= c->state[(c->index-24) & 63]; - return c->state[c->index++ & 63] = 2*a*b+a+b; + a = c->state[c->index & 63] = 2*a*b+a+b; + c->index += 1U; + return a; } /** diff --git a/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/avcodec.lib b/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/avcodec.lib index 29d0e73..983f2b8 100644 Binary files a/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/avcodec.lib and b/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/avcodec.lib differ diff --git a/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/avdevice.lib b/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/avdevice.lib index 9e943f2..b5a7ece 100644 Binary files a/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/avdevice.lib and b/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/avdevice.lib differ diff --git a/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/avfilter.lib b/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/avfilter.lib index 9940c2b..4a6a3e5 100644 Binary files a/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/avfilter.lib and b/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/avfilter.lib differ diff --git a/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/avformat.lib b/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/avformat.lib index a1116bc..71178a4 100644 Binary files a/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/avformat.lib and b/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/avformat.lib differ diff --git a/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/avutil.lib b/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/avutil.lib index a0ec59f..dd741be 100644 Binary files a/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/avutil.lib and b/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/avutil.lib differ diff --git a/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/postproc.lib b/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/postproc.lib index 4c1688d..35ea753 100644 Binary files a/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/postproc.lib and b/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/postproc.lib differ diff --git a/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/swresample.lib b/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/swresample.lib index f25b3f1..4449252 100644 Binary files a/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/swresample.lib and b/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/swresample.lib differ diff --git a/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/swscale.lib b/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/swscale.lib index 19bb8bb..d9cc8aa 100644 Binary files a/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/swscale.lib and b/ffmpegdemo/ffmpeg/ffmpeg4/winlib64/swscale.lib differ