Commit Graph

28 Commits

Author SHA1 Message Date
Roman Donchenko
36b5180aa1 Another FFmpeg fix from master.
From commit dd74a851, to be exact. Now cap_ffmpeg.cpp should actually
build if HAVE_FFMPEG is true.

Also modified some gpu sources in a similar manner.
2013-10-25 16:08:14 +04:00
Roman Donchenko
3c137f7a04 Converted tabs to spaces. 2013-08-21 18:59:26 +04:00
Roman Donchenko
f55740da70 Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
Alexander Smorkalov
9af2c1661a Restricted Win32 API was fixed in Highgui and some 3rd party libs. Patch
for libpng added.
2013-08-15 06:42:00 -07:00
Alexander Smorkalov
9fb762ccec VideoCapture for video files implemented.
Set and Get methods are not implemented;
Camera based video capture is broken due to modifications.
2013-06-24 02:45:24 -07:00
Alexander Smorkalov
ccb8292e8e Media Foundation-based VideoWriter added 2013-06-24 02:45:22 -07:00
Alexander Smorkalov
09bc99a0c0 HAVE_WIN32UI and HAVE_VFW checks and defines added. 2013-03-27 08:03:51 -07:00
Alexander Smorkalov
3d594c70ff Multiple Windows RT fixes
TIFF build was fixed;
Direct Show back-end was enabled;
More accurate guards implemented.
2013-03-19 17:46:01 -07:00
Alexander Smorkalov
06aff4e7b0 Initial Windows RT support commit.
GPU module turned off;
TIFF support turned off;
Windows Managment and Video IO (VFW) turned off.
2013-03-13 09:02:15 -07:00
Ilya Lavrenov
5512f91d08 removed libstdc++ dependency 2013-02-12 14:20:23 +04:00
Andrey Kamaev
2ed6bc8aaf Revert ffmpeg related changes from "thread-safe VideoWriter and VideoCapture"
This reverts commit 4abf0b3193.

Changes are reverted because they break build of proxy dlls on Windows
2013-02-11 14:15:29 +04:00
Andrey Kamaev
e3474878b6 Consistently use 4-digit library version 2013-01-18 14:57:55 +04:00
Alexander Smorkalov
6e0db3f527 Feature #1322 "If dll cannot be loaded a warning should be generated" implemented. 2012-12-03 13:52:49 +04:00
Ilya Lavrenov
4abf0b3193 thread-safe VideoWriter and VideoCapture 2012-11-19 16:44:23 +04:00
Andrey Kamaev
bd0e0b5800 Merged the trunk r8589:8653 - all changes related to build warnings 2012-06-15 13:04:17 +00:00
Vadim Pisarevsky
2c88791600 get back to single-version ffmpeg wrapper (no more v2); make sure the library builds and the tests pass on Ubuntu 10.04 that includes pretty old version of ffmpeg 2012-04-30 12:39:22 +00:00
Vadim Pisarevsky
f87c2e49db added version number to opencv_ffmpeg dlls (it's added only when dll copied to the bin directory); it resolves #1827 2012-04-26 13:32:27 +00:00
Alexander Reshetnikov
05abdcd64f Changes of highgui structure 2012-04-09 17:38:46 +00:00
Vadim Pisarevsky
b33224f0b6 merged the latest fixes in 2.3 to trunk 2011-07-04 16:18:12 +00:00
Vadim Pisarevsky
49467947ac propagated some fixes from 2.3 to trunk 2011-06-23 12:00:09 +00:00
Vadim Pisarevsky
873b72edd9 use original image type (8-bit grayscale or 24-bit RGB) in the case of RAW video (ticket #782) 2011-06-19 22:23:59 +00:00
Vadim Pisarevsky
ec97683ddf fixed positioning in ffmpeg wrapper (thanks to mike_at_nrec for the patch). Added frame positioning feature to laplace demo to test the feature 2011-06-19 22:06:32 +00:00
Andrey Morozov
802fcc57a2 fixed "bitrate tolerance too small for bitrate" 2011-06-16 08:31:08 +00:00
Vadim Pisarevsky
636cb15f3d add protection against EAGAIN error in the streams (thanks to vrabaud for the patch - ticket #553) 2010-11-22 13:07:43 +00:00
Vadim Pisarevsky
26c6b955a8 updated ffmpeg to 0.6.0 2010-08-05 17:24:41 +00:00
Vadim Pisarevsky
d7691f6cad another attempt to fix cvcap_ffmpeg.cpp compile errors 2010-06-11 18:43:46 +00:00
Vadim Pisarevsky
fb2e7142b1 handle missing UINT64_C definition 2010-06-11 03:59:43 +00:00
Vadim Pisarevsky
127d6649a1 "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00