Merge pull request #1806 from akarsakov:ffmpeg_without_iconv

2025-08-06 14:36:36 +08:00 · 2013-11-18 17:26:38 +04:00 · 2013-11-18 17:26:38 +04:00 · 8b99a1e850
commit 8b99a1e850
parent 7703b63cae 83cefcb92a
7 changed files with 1 additions and 1 deletions
--- 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
--- a/3rdparty/ffmpeg/opencv_ffmpeg.dll
+++ b/3rdparty/ffmpeg/opencv_ffmpeg.dll
--- a/3rdparty/lib/libavcodec.a
+++ b/3rdparty/lib/libavcodec.a
--- a/3rdparty/lib/libavdevice.a
+++ b/3rdparty/lib/libavdevice.a
--- a/3rdparty/lib/libavformat.a
+++ b/3rdparty/lib/libavformat.a
--- a/3rdparty/lib/libavutil.a
+++ b/3rdparty/lib/libavutil.a
--- a/3rdparty/lib/libswscale.a
+++ b/3rdparty/lib/libswscale.a