FFmpeg 2.0.2 32-bit builded with mingw (4.6.1) with following additional options: --enable-w32threads --disable-iconv --cpu=i686 (workaroud for http://trac.ffmpeg.org/ticket/2363)

2013-11-18 13:56:02 +04:00 · 2013-11-18 13:56:02 +04:00 · 83cefcb92a
commit 83cefcb92a
parent 2e79dde357
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