diff --git a/3rdparty/ffmpeg/make.bat b/3rdparty/ffmpeg/make.bat index 442fce50531a43b91e2684661aabde6d4a8d6771..318c2fee88246f110ec74af8b48b63b71c0beb75 100644 --- a/3rdparty/ffmpeg/make.bat +++ b/3rdparty/ffmpeg/make.bat @@ -1,2 +1,2 @@ -set path=c:\dev\msys32\bin;%path% & gcc -Wall -shared -o opencv_ffmpeg.dll -O2 -x c++ -I../include -I../include/ffmpeg_ -I../../modules/highgui/src ffopencv.c -L../lib -lavformat -lavcodec -lavdevice -lswscale -lavutil -liconv -lws2_32 +set path=c:\dev\msys32\bin;%path% & gcc -Wall -shared -o opencv_ffmpeg.dll -O2 -x c++ -I../include -I../include/ffmpeg_ -I../../modules/highgui/src ffopencv.c -L../lib -lavformat -lavcodec -lavdevice -lswscale -lavutil -lws2_32 set path=c:\dev\msys64\bin;%path% & gcc -m64 -Wall -shared -o opencv_ffmpeg_64.dll -O2 -x c++ -I../include -I../include/ffmpeg_ -I../../modules/highgui/src ffopencv.c -L../lib -lavformat64 -lavcodec64 -lavdevice64 -lswscale64 -lavutil64 -lws2_32 \ No newline at end of file diff --git a/3rdparty/ffmpeg/opencv_ffmpeg.dll b/3rdparty/ffmpeg/opencv_ffmpeg.dll index d556b0d068ff67b75a704a9843306e460dce8190..b1e70df6a3e0059530f13800ae675820081388dc 100644 Binary files a/3rdparty/ffmpeg/opencv_ffmpeg.dll and b/3rdparty/ffmpeg/opencv_ffmpeg.dll differ diff --git a/3rdparty/lib/libavcodec.a b/3rdparty/lib/libavcodec.a index 2f8bace41fbf4a5f30f15ee2a23f1a3ed0eff847..45c31c57882770cbb5376cdc50d7641af1d5a164 100644 Binary files a/3rdparty/lib/libavcodec.a and b/3rdparty/lib/libavcodec.a differ diff --git a/3rdparty/lib/libavdevice.a b/3rdparty/lib/libavdevice.a index 15ef35ac723c44bf70db609c505247d528df6610..41ba6a1299e68786e71f4a3cc4335259b9b572bb 100644 Binary files a/3rdparty/lib/libavdevice.a and b/3rdparty/lib/libavdevice.a differ diff --git a/3rdparty/lib/libavformat.a b/3rdparty/lib/libavformat.a index 9cd2715d24b54e0d5b03da84b23e0c202b285214..ab267be9aa22b2f303bfb327a1094e0aa8111b83 100644 Binary files a/3rdparty/lib/libavformat.a and b/3rdparty/lib/libavformat.a differ diff --git a/3rdparty/lib/libavutil.a b/3rdparty/lib/libavutil.a index cfb89bd65585817eabdea247f04162a1d0386034..7c0cda34109408e2cd32cd12d40c98f1ad5ea2e6 100644 Binary files a/3rdparty/lib/libavutil.a and b/3rdparty/lib/libavutil.a differ diff --git a/3rdparty/lib/libswscale.a b/3rdparty/lib/libswscale.a index 23e6d8ab079bc0ba06fda9a1a2ea118b31576a16..91f9d7597c50044c7e46d372ee417ea459722f57 100644 Binary files a/3rdparty/lib/libswscale.a and b/3rdparty/lib/libswscale.a differ