Vitaly Tuzov
389f176a67
Removed ioctl calls to query for VIDIOC_G_INPUT and VIDIOC_ENUMINPUT since information returned by the calls is never used.
...
Fixed icvCaptureFromCAM_V4L return value in case of V4L2 camera initialization failure.
2016-01-18 12:54:53 +03:00
Gregory Morse
5427ede6a1
WinRT consistency
2015-12-31 14:31:26 +01:00
Alexander Alekhin
0862e8e34c
fix build
2015-12-17 13:25:10 +03:00
Maksim Shabunin
eebd4cad66
Fix compilation problems with XCode 7.1.1 and cmake 3.3.2
2015-11-17 18:52:55 +03:00
Ilya Lavrenov
9e2395e7e0
return false in grabFrame failed in open method
2015-10-27 16:56:31 +03:00
Ilya Lavrenov
05945bf00e
fixed case when grabbing failed
2015-10-27 16:26:24 +03:00
Ilya Lavrenov
9d78a1ea9f
allow to retrieve videocapture properties before first frame reading
2015-10-26 14:37:38 +03:00
Pavel Rojtberg
cfd498a8eb
fix compilation with qt
...
QSlider does not have getMinimum/Maximum getters. Probably was not
compile tested.
2015-10-23 21:42:11 +02:00
Aman Verma
d5e314e728
Fixing compilation errors in windows and mac
2015-10-19 10:58:43 +00:00
Aman Verma
b0209ad7f7
Fix for #5495 : add setTrackbarMin
2015-10-19 08:44:06 +00:00
spmallick
066c775321
Update window_QT.h
...
QPushButton was included twice.
2015-10-13 15:51:43 -07:00
a-andre
d16fb30512
install opencv2/highgui.hpp header
2015-10-13 18:16:14 +02:00
Ilya Lavrenov
0d5b739d35
delete video readers
2015-10-12 00:40:23 +03:00
Sergiu Dotenco
514b202d7b
highgui: CV_WINDOW_AUTOSIZE does not resize with GTK3
2015-10-06 17:01:28 +02:00
Alexander Alekhin
60a689d27c
Merge pull request #5202 from ilya-lavrenov:gstreamer-v4l2
2015-09-24 14:46:23 +00:00
Vadim Pisarevsky
f838a832b2
Merge pull request #5357 from fxtentacle:ha-2.4.11
2015-09-21 14:31:13 +00:00
Suleyman TURKMEN
dff9d2288b
Update window_w32.cpp
2015-09-21 00:34:15 +03:00
Hajo Nils Krabbenhöft
7825cbeb7d
buffer_size should be in bytes, not bits
2015-09-16 22:19:51 +02:00
Hajo Nils Krabbenhöft
d38fee7599
fix crash for large BW tif images
2015-09-16 22:04:42 +02:00
Maksim Shabunin
0a6e93dd3a
Merge pull request #5258 from sturkmen72:patch-6
2015-09-10 09:22:07 +00:00
Suleyman TURKMEN
e15dabf1db
documentation patch
2015-09-05 10:41:01 +03:00
Maksim Shabunin
771af4f32d
Some changes to support mingw-w64
...
- IPP is disabled by default when compiler is mingw (couldn't make it
work)
- fixed some warnings
- fixed some `__GNUC__` version checks (for correctness and convenience)
- removed UTF-8 BOM from hough.cpp (fixes #5253 )
2015-09-01 00:59:08 +03:00
Vadim Pisarevsky
bd43c62a75
Merge pull request #5232 from sturkmen72:patch-6
2015-08-27 07:07:53 +00:00
Suleyman TURKMEN
f660461bb3
documentation patch
2015-08-26 17:40:38 +03:00
Vadim Pisarevsky
587b0cc7b4
Merge pull request #4200 from Astero92:#3800
2015-08-25 18:08:54 +00:00
Ilya Lavrenov
75fcedf0ed
added some property setting and getting
2015-08-16 21:25:36 +03:00
Ilya Lavrenov
c19ed39a78
repaired GStreamer 0.10 version
2015-08-16 21:01:22 +03:00
Ilya Lavrenov
dbd7912b88
repaired gstreamer camera capture:
...
1. Enabled property retrieval: height, width, FPS
2. Fixed issue when isOpened returns always true even for non-existing devices
3. Ability to work with non-0 device. Camera capture index is taken into account
2015-08-16 11:16:25 +03:00
Suleyman TURKMEN
7522527827
Update window_w32.cpp
2015-07-20 16:35:00 +03:00
Dominik Kleiser
f363670934
Bug #3800 - Resize viewport when CV_WINDOW_KEEPRATIO was set (Qt)
2015-07-17 20:02:01 +02:00
Alexander Alekhin
aa871ca506
fix wrong usage of status(), remove useless message in videoio
2015-07-10 19:18:07 +03:00
Maxim Kostin
face069874
Added support for highgui module on WinRT 8.1+
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-06-26 23:41:25 +03:00
Maxim Kostin
6724a0b8cd
Added dummy highgui WinRT implementation
2015-06-15 15:59:16 +03:00
Vincent Rabaud
50842b9036
get code to compile on Ubuntu Saucy
...
A define was forgotten for the codecs and there was a typo for
another.
(cherry picked from commit f052b0bc4d
2015-06-09 15:53:08 +03:00
Vadim Pisarevsky
3d6413cfc6
fixed compile warnings; hopefully fixed test failures
...
(cherry picked from commit 30912b49f3
2015-06-09 15:53:08 +03:00
Vadim Pisarevsky
799622affd
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
...
(cherry picked from commit 2b2e3ee93c
2015-06-09 15:53:08 +03:00
Vadim Pisarevsky
8fb37606f6
Merge pull request #4032 from mshabunin:fix-pkg-config
2015-05-26 12:47:14 +00:00
Mike Maraya
607d3b54ce
Fixes resizeWindow() on OS X (Bug #3200 )
2015-05-23 17:36:46 +02:00
Dikay900
7ca0557b40
typos in comments
2015-05-23 17:36:45 +02:00
Maksim Shabunin
3863dc5b2b
Updated pkg-config generation, added sample makefile
2015-05-22 16:09:07 +03:00
Vadim Pisarevsky
5de9d8e6e1
Merge pull request #3994 from mshabunin:fix-gtk-crash
2015-05-12 15:11:07 +00:00
Ashod Nakashian
7cd198623e
Prevent the parent from drawing over OpenGL context.
2015-05-09 12:23:09 -04:00
Nguyen Nguyen
58dd70e8dc
Revert support for audio
2015-05-08 12:06:03 -04:00
Nguyen Nguyen
53ff537f1c
temporary fixes
2015-05-08 11:33:11 -04:00
Maksim Shabunin
01c3d491e7
Fixed python crash when both cv2.imshow and gtk module are used
2015-05-07 16:44:45 +03:00
Nguyen Nguyen
a5814871d9
Adding audio to opencv
2015-05-06 17:01:38 -04:00
Nguyen Nguyen
9682430a69
Adding code to deal with audio output
2015-05-05 13:14:26 -04:00
Nguyen Nguyen
b69ffe6376
Fixed memory leak when recording video in iOS
2015-05-04 16:21:25 -04:00
Nguyen Nguyen
1f72815637
Exporting videoFileString to outside world
2015-05-04 12:38:55 -04:00
Luis Díaz Más
b599774e30
Fix a bug that impede to set the trackbar pos using the Qt control panel
...
Conflicts:
modules/highgui/src/window_QT.cpp
2015-04-25 18:54:53 +02:00
Luis Díaz Más
e6f7e96ff4
Fixing the bug #4244 that I just reported in code.opencv.org
2015-04-25 18:54:52 +02:00
Craig Reynolds
b4c7c011b7
In cvAddText, construct QString from "text" using fromUtf8.
2015-04-25 18:54:51 +02:00
Eric Sommerlade
41b920344d
added support for uncompressed parameters to tiff image format as described here: expertland.net/question/b6o3n6p9a72341db823b48nl98m91dx8n1/detail.html
...
Conflicts:
modules/imgcodecs/src/grfmt_tiff.cpp
2015-04-24 22:59:08 +02:00
Kevin Hughes
ac3ec0d96d
squashed #823
...
removed separate example for reading image sequences and modified starter_video.cpp to better explain the functionality of VideoCapture. I also added a bit more explanation in the documentation of the VideoCapture interface
Conflicts:
modules/highgui/doc/reading_and_writing_images_and_video.rst
samples/cpp/starter_video.cpp
starter_video.cpp changed CV WINDOW KEEPRATIO to just WINDOW KEEPTATIO to fix build error
starter_video.cpp hid local functions
2015-04-24 21:58:14 +02:00
Ilya Lavrenov
02e29fc99c
suppress -Wclobbered warning
2015-04-22 16:42:03 +03:00
Andrew Senin
8c55d7be5e
Ximea camera fix (see issue #4235 )
2015-04-03 22:50:05 +03:00
Andrey Pavlenko
eeae81e903
fixing confusing variable naming in a sample code
2015-04-03 13:54:49 +03:00
Prof. Dr. Rudolf Haussmann
a9d4e05346
Changes to be committed:
...
(use "git reset HEAD <file>..." to unstage)
modified: highgui/include/opencv2/highgui/highgui_c.h
modified: highgui/src/cap_dshow.cpp
modified: java/generator/gen_java.py
The correction of the orthographic error in the enumeration constant
CAP_PROP_MONOCROME has been undone.
2015-03-25 15:45:20 +01:00
Prof. Dr. Rudolf Haussmann
e5e6367223
Merge remote-tracking branch 'upstream/2.4' into 2.4
2015-03-25 13:38:49 +01:00
Prof. Dr. Rudolf Haussmann
756c1a22d9
Merge remote-tracking branch 'upstream/2.4' into 2.4
2015-03-20 01:44:29 +01:00
Prof. Dr. Rudolf Haussmann
a7bf1d53d8
Changes to be committed:
...
(use "git reset HEAD <file>..." to unstage)
modified: modules/highgui/include/opencv2/highgui/highgui_c.h
modified: modules/highgui/src/cap_dshow.cpp
modified: modules/highgui/src/cap_pvapi.cpp
modified: modules/java/generator/gen_java.py
Änderungen in der PvAPI hinzugefügt.
2015-03-20 01:42:16 +01:00
Luis Díaz Más
7711cd284b
Fix a bug that impede to set the trackbar pos using the Qt control panel
2015-03-19 21:25:10 +01:00
Luis Díaz Más
d14a1de947
Fixing the bug #4244 that I just reported in code.opencv.org
2015-03-18 20:07:08 +01:00
StevenPuttemans
cef2cf2852
fixing locale settings - making it universal
2015-03-06 13:13:53 +01:00
Vadim Pisarevsky
6820292256
Merge pull request #3700 from MSOpenTech:winrt-cmake-contrib
2015-03-03 12:52:03 +00:00
Maxim Kostin
cdd23440c9
Adding support for WinRT(WinPhone 8/8.1 and Win Store) via CMake 3.1
...
- Substituted HAVE_WINRT with WINRT
- Fixed compilation issues in ocl.cpp and parallel.cpp
- Fixed compiler issue for WP8: "C2678: binary '+' : no operator found which takes a left-hand - Fixed gitignore
- Added #ifdef HAVE_OPENCL to remove compiler warnings in ocl.cpp
- Used NO_GETENV similar to '3rdparty\libjpeg\jmemmgr.c;
- Added ole32.lib for core module (for WindowsStore 8.0 builds)
- Made OpenCV_ARCH aware of ARM
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:43 +03:00
Maksim Shabunin
37c74e38f4
Python support
2015-03-02 18:13:00 +03:00
StevenPuttemans
350dccf84a
fix error 3714
2015-02-20 13:30:40 +01:00
StevenPuttemans
4f621de849
fix bug 3714 2.4 branch
2015-02-20 12:39:31 +01:00
Vadim Pisarevsky
65e4df751c
Merge pull request #3705 from SpecLad:unused-nNull
2015-02-19 18:40:22 +00:00
Alexander Alekhin
4e8aac5308
Merge pull request #3683 from SeninAndrew:2.4
2015-02-18 17:15:10 +00:00
Roman Donchenko
d218f28070
cap_msmf.hpp: fix a warning about nNull being unused
...
The two functions featuring nNull are not particularly needed, so
I simply removed them.
2015-02-16 19:31:51 +03:00
Roman Donchenko
77578d415f
Fix a memory leak in CvCapture_FFMPEG::close
...
FFmpeg now requires that frames allocated with avcodec_alloc_frame are
freed with avcodec_free_frame.
2015-02-13 15:12:52 +03:00
Andrew Senin
b9a6edfe3d
Fixing XIMEA parameters mapping (issue #4176 )
2015-02-09 15:15:23 +03:00
AfterEight
e938563de5
Modified resetCvImage() in cap_ximea.cpp, so that the IplImage* frame is also updated after the resolution has changed via set(CV_CAP_PROP_FRAME_WIDTH, value)/set(CV_CAP_PROP_XI_DOWNSAMPLING, value)
2015-02-02 15:04:29 +01:00
Vadim Pisarevsky
9a6a046caf
Merge pull request #3613 from asmorkalov:aarch64_tiff
2015-01-20 12:36:38 +00:00
Vadim Pisarevsky
dc27a13426
Merge pull request #3570 from a-wi:Win32_UI_commctrl_defs_v3
2015-01-19 10:54:26 +00:00
Craig Reynolds
72d90ba8d2
In cvAddText, construct QString from "text" using fromUtf8.
2015-01-16 14:57:11 -08:00
Alexander Smorkalov
d277a1ba75
TIFF support hack for aarch64 reverted.
2015-01-17 01:25:58 +03:00
Artur Wieczorek
1264be8785
Check if _WIN32_IE is defined with proper value in window_w32.cpp
...
TBBUTTONINFO struct and BTNS_xxx symbols used in the code need _WIN32_IE to be defined with at least 0x0500 value (_WIN32_IE_IE50) in order to be included from commctrl.h.
2015-01-14 14:52:32 +01:00
Alexander Smorkalov
8acd4c3ff4
More accurate fix for libtiff and aarch64.
2014-12-28 12:44:24 +03:00
Maksim Shabunin
d01bedbc61
Removed Sphinx documentation files
2014-12-26 19:12:19 +03:00
Vadim Pisarevsky
a5969aec96
Merge pull request #3534 from taka-no-me:build_fixes
2014-12-26 14:34:13 +00:00
Andrey Kamaev
c105b72945
Assorted fixes:
...
* cmake CMP0054 and CMP0045
* aarch64 build
* portable code options in PCH cmake
* some of gcc 4.9 warnings
2014-12-25 12:41:16 +03:00
Vladislav Vinogradov
53862687d5
rename CudaMem -> HostMem to better reflect its purpose
2014-12-23 17:42:49 +03:00
Vadim Pisarevsky
d9f159a554
Merge pull request #3513 from mshabunin:compat-30
2014-12-22 11:58:01 +00:00
Vadim Pisarevsky
63bc4d4b7f
Merge pull request #3471 from HelenWong:FixBug3714
2014-12-22 10:55:23 +00:00
Vadim Pisarevsky
03df7831ab
Merge pull request #3514 from mshabunin:compat-24
2014-12-22 10:38:56 +00:00
Maksim Shabunin
c485aee464
Included c-headers for better 2.4 compatibility
2014-12-19 17:05:26 +03:00
Maksim Shabunin
91e21847e2
Some changes to make migration to 3.0 easier
2014-12-16 13:00:31 +03:00
Vadim Pisarevsky
d54b069ae1
Merge pull request #3448 from Ashod:highgui_trackbar_improvements
2014-12-15 18:03:01 +00:00
Ashod Nakashian
63c49be487
highgui: Support to change trackbar count in setTrackbarPos and replaced deprecated CreateToolbarEx in Windows.
2014-12-06 11:56:01 -05:00
Ashod Nakashian
006384edaf
highgui: Support to change trackbar count in setTrackbarPos and replaced deprecated CreateToolbarEx in Windows.
2014-12-06 11:55:17 -05:00
Andrey Kamaev
05bc48e8f4
Make Ctrl+S open save dialog on Gtk backend
2014-12-05 14:53:19 +03:00
Andrey Kamaev
fac99de7ec
It turns opengl gheck is not needed for win ctrl+s
2014-12-05 14:52:44 +03:00
HelenWong
ec57a938c0
Fix#3714:Improve Display Image Tutorial
...
For Bug #3714 , user use the imshow() function without calling
namedWindow() properly, because user did not know the implicit rule for
imshow(). (i.e. without calling namedWindow implied calling namedWindow(
,CV__WINDOW_AUTOSIZE).
Improve the Display Image Tutorial to educate the user for such implied
rule.
Put a note on documentation for Bug#3714
Revise the documentation regarding to imshow() function to better
educate the user the implicit rule. (i.e. without creating the window
before the imshow() function is the same as creating AUTOSIZE window)
2014-12-02 09:43:52 -08:00
Maksim Shabunin
1523fdcc1c
Doxygen documentation: more fixes and cleanups
2014-12-01 15:50:36 +03:00
Maksim Shabunin
dcae7698ad
Doxygen documentation for: highgui, video, imgcodecs and videoio
2014-12-01 15:47:13 +03:00
Vadim Pisarevsky
02f4f2f96d
Merge pull request #3426 from mshabunin:doxygen-imgproc
2014-12-01 10:43:13 +00:00
Andrey Kamaev
3fa02787ac
Make Ctrl+S open save dialog on Windows
2014-11-30 00:43:21 +03:00
Vadim Pisarevsky
ba9bc2d72f
Merge pull request #3409 from fish2000:patch-1
2014-11-19 16:25:36 +00:00
StevenPuttemans
f151b1d277
fix wrong property name and corresponding documentation
2014-11-19 14:00:40 +01:00
Andrey Kamaev
f4ba8b13c7
Add cv::setWindowTitle to highgui
2014-11-18 16:54:03 +03:00
Maksim Shabunin
555fdf893a
Documenting imgproc module
...
- disabled doxygen tree
- enabled doxygen enum listing
- added imgproc reference to main page
- enabled BiB support
- chenged doxygen root page format
2014-11-18 14:00:56 +03:00
StevenPuttemans
d9164bdd4c
added extra BUFFERSIZE doc and getter
2014-11-14 14:09:43 +01:00
StevenPuttemans
2b8229f716
adding extra buffer parameter
2014-11-12 13:09:53 +01:00
Alexander Bohn / FI$H2k
8340e31f1f
Fixed OS X compilation error in window_cocoa.mm
...
Un-commented `NSApplicationActivationPolicyRegular` argument (in leu of zero) and got rid of problematic dereference
2014-11-11 04:35:35 -08:00
Vadim Pisarevsky
e05a0bc6c5
Merge pull request #3322 from StevenPuttemans:fix_pvpapi_interface
2014-11-10 08:27:42 +00:00
StevenPuttemans
7dce2d0b8f
fixing cap_pvpapi interface and making sure both AVT Manta and Proscilla
...
series are supported. Testing this with both cams for Windows and Linux
exhaustively.
Optimizing memory footprint by removing unused calls.
Adapted with the input of Shai
Added small example that illustrates how it should work.
2014-10-28 15:33:37 +01:00
Maksim Shabunin
09fb7512ed
Fixed iOS framework compilation warnings
2014-10-27 15:28:21 +03:00
Dinar Ahmatnurov
b5a6df4966
fixed issue with malformed UTF-8 string;
...
ocl: Change static variable order in cl_context.cpp to avoid crashes during destruction
ContextImpl::currentContext contains a reference to one of the
DeviceInfoImpl objects from:
static std::vector<DeviceInfoImpl> global_devices;
ContextImpl::currentContext is destroyed in the destructor
for the statically defined object __module, and relies on its
DeviceInfoImpl reference to query some hardware features while
being destroyed.
This means that we need to ensure that the global_devices vector is
destroyed affter __module, otherwise ContextImpl::currentContext's
DeviceInfoImpl reference will no longer be valid when __module is
destroyed.
Since these variables are all confined to a single compilation unit,
they will be destruct from bottom to top, so we need to make sure
that __module is the bottom definition so it can be destroyed first.
iOS: fix crash from overrelease in UIImageToMat
viz: fixed memory leak, issue 3961
fix installation layout for debian packages:
Install symlinks to shared libraries as a part of development package,
not runtime package.
It is default behavior for debian packages.
Fix test name.
TIFF loader: Allocate large enough buffer when (bpp * ncn) > 8.
TIFF loader: Pass buffer size to read functions.
replace not ascii and not cyrillic symbols with '?';
add test for putText;
fix warning;
minor fixes;
2014-10-27 12:47:53 +03:00
Vadim Pisarevsky
67e50b4415
Merge pull request #3362 from mshabunin:fix-drawing-24
2014-10-26 17:44:07 +00:00
Vadim Pisarevsky
0cf170587f
Merge pull request #3363 from asmorkalov:qnx_support
2014-10-26 17:42:24 +00:00
Alexander Smorkalov
6bb6039ebb
Fixes for QNX 6.6 Neitrino support.
2014-10-23 17:17:35 +04:00
Maksim Shabunin
ba7c92b0e8
Fixed highgui drawing test
...
- changed image comparison technique
- removed old assert statements
2014-10-23 13:28:33 +04:00
Andreas Stührk
24580e348a
TIFF loader: Pass buffer size to read functions.
2014-10-19 01:22:18 +02:00
Andreas Stührk
cfdcf9f2d2
TIFF loader: Allocate large enough buffer when (bpp * ncn) > 8.
2014-10-19 01:22:04 +02:00
Andreas Stührk
63ac69cadf
Fix test name.
2014-10-19 01:13:35 +02:00
Maksim Shabunin
630eddf25a
Extracted repeated cmake instruction block
2014-10-17 18:14:53 +04:00
Thomas Weisbach
81c0537b0c
iOS: fix crash from overrelease in UIImageToMat
2014-10-17 17:49:14 +09:00
Vadim Pisarevsky
ff8e32453b
Merge pull request #3307 from ilya-lavrenov:ffmpeg_rtsp
2014-10-10 11:02:50 +00:00
Ilya Lavrenov
fb2012def2
TCP instead of UDP
2014-10-09 19:23:51 +04:00
Vadim Pisarevsky
d7ba03a9cb
Merge pull request #3298 from a-wi:DShow_capture
2014-10-09 15:00:25 +00:00
Andreas Stührk
afb164cc15
Don't allocate lots of memory when reading TIFFs with infinite rows per strip.
...
Some TIFF images consist of only one strip. The magic value 2**32-1 for the
"rows per strip" tag reflects that fact, effectively meaning "infinite".
2014-10-08 23:31:30 +02:00
Artur Wieczorek
5c96021172
Fixed getting CV_CAP_PROP_FOURCC property value
...
Save selected FCC in order to return proper CV_CAP_PROP_FOURCC property value (currently FCC for RGB24 is always returned).
2014-10-02 21:41:54 +02:00
Artur Wieczorek
4b1bb702ce
Fixed media type GUID for I420 format in DShow capture.
...
FOURCC code bytes should be placed in the reverse order.
2014-10-02 13:07:50 +02:00
Artur Wieczorek
7e78b5d06e
Fixed selecting media type in DShow video capture.
...
Set correct value of sample size when calling IAMStreamConfig::SetFormat function. For non-RGB media type it can be set to zero value.
(See http://msdn.microsoft.com/en-us/library/windows/desktop/dd373477%28v=vs.85%29.aspx )
2014-10-02 12:08:37 +02:00
Alexander Smorkalov
11c81067dc
doc/check_docs2.py warnings fixes
2014-10-02 13:40:30 +04:00
Andrey Pavlenko
533fde66e3
Merge pull request #3281 from a-wi:MSMF_remove_ATL_dependency
2014-10-01 07:26:25 +00:00
Alexander Smorkalov
8271c4e9c4
Highgui_Video.prop_fps disabled as fails with FFmpeg in Ubuntu 14.04.
2014-09-30 13:35:19 +04:00
Alexander Smorkalov
1f4fe3bb27
GStreamer 1.0 backport from master branch.
2014-09-30 12:30:09 +04:00
Artur Wieczorek
e3f1d722e7
Remove ATL dependency from MSMF capture code
...
Use _com_ptr_t instead of CComPtr in ComPtr wrapper to avoid ATL dependency.
2014-09-30 01:35:59 +02:00
Maksim Shabunin
a160158cb3
Merge pull request #3272 from mgeorg:reset_ffmpeg_mutex_2_4
2014-09-29 12:07:22 +00:00
Vadim Pisarevsky
1920232268
Merge pull request #3260 from a-wi:MSMF_file_error
2014-09-27 13:06:18 +00:00
Manfred Georg
7f4eb4f6c6
set ffmpeg mutex to NULL on destruction.
...
The Mutex manager registered with ffmpeg must reset the mutex to NULL after destruction, otherwise ffmpeg will give the invalid mutex to the next mutex manager when it asks it to CREATE a new mutex.
See ffmpeg code: http://git.videolan.org/?p=ffmpeg.git;a=blob;f=libavcodec/utils.c;h=28c5785398fcf11a3d3c70a8cd09e9df798e2734;hb=HEAD#l3423
Cherry picked from head (file has moved but issue is the same).
Conflicts:
modules/videoio/src/cap_ffmpeg_impl.hpp
2014-09-26 10:19:34 -07:00
Artur Wieczorek
93d1ceae43
Use FFMPEG capture only if HAVE_FFMPEG flag is defined.
2014-09-24 02:11:59 +02:00
Artur Wieczorek
073a7ff95a
Fixed CMake issue with FFMPEG highgui configuration
...
Currently, FFMPEG source files are included in highgui project file regardless of CMake WITH_FFMPEG option.
After applying this PR FFMPEG files are included only if WITH_FFMPEG option is enabled.
2014-09-23 23:46:03 +02:00
Artur Wieczorek
5bf1a4c08c
Fixed MSMF file capture error while opening the file containing unsupported video stream format
2014-09-23 20:21:53 +02:00
Artur Wieczorek
3603102c89
Fixed assertion warning in MSMF frame grabber
2014-09-22 19:38:04 +02:00
Artur Wieczorek
a615102947
Fixed MSMF video capture initialization
2014-09-22 19:35:36 +02:00
Vadim Pisarevsky
9c91d0103f
Merge pull request #3247 from a-wi:CMake_MSMF_configuration
2014-09-22 15:31:09 +00:00
Artur Wieczorek
7c354c14f7
CMake configuration for MSMF capture
2014-09-21 21:03:41 +02:00
Artur Wieczorek
d2ba09e6ff
Fix linking error under Win 7 - do not import MinCore_Downlevel.lib if target is Win 7 or earlier.
2014-09-19 22:46:09 +02:00
Artur Wieczorek
539f8032dc
Fixed compilation errors under VS 2010 and Win 7
2014-09-19 17:07:52 +02:00
Vadim Pisarevsky
1578dd1027
Merge pull request #2702 from GregoryMorse:patch-3
2014-09-18 12:38:54 +00:00
Vadim Pisarevsky
ccaedaedc8
Merge pull request #2047 from GregoryMorse:patch-4
2014-09-17 12:48:45 +00:00
Vadim Pisarevsky
533dd85299
Merge pull request #3225 from jormansa:bug_#3631
2014-09-17 10:40:42 +00:00
jormansa
1d2d579bd6
bug fixed
2014-09-15 18:09:44 +02:00
Maksim Shabunin
882426a9b2
Stripped iCCP chunk from png files
2014-09-15 12:48:28 +04:00
Vadim Pisarevsky
e810f3052d
Merge pull request #3206 from stonier:parallel_qt
2014-09-14 18:48:51 +00:00
