Merge pull request #1806 from akarsakov:ffmpeg_without_iconv

8b99a1e8 · Roman Donchenko · OpenCV Buildbot · 7703b63c · 83cefcb9 · 8b99a1e8
Commit 8b99a1e8 authored Nov 18, 2013 by Roman Donchenko Committed by OpenCV Buildbot Nov 18, 2013
7 changed files
--- a/3rdparty/ffmpeg/make.bat
+++ b/3rdparty/ffmpeg/make.bat
-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
--- 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