14d27112e9
Fix build of ffmpeg wrapper with some versions of avutil
2013-03-14 14:52:13 +04:00
d9cd753835
Merge pull request #645 from taka-no-me:bump_headers
2013-03-14 11:42:23 +04:00
a42a0f5fca
Added compatibility headers
2013-03-13 17:26:56 +04:00
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
7e50d3e571
Fixed MSVC warnings
2013-03-13 11:34:04 +04:00
9f3ce0dd97
Reword and merge pull request #625 from jet47/gpu-fixes
2013-03-12 18:14:23 +04:00
ecb2ebfba4
Move opengl iterop code to cv::ogl namespace
...
Fixed issues: #2737 #2848
2013-03-12 18:13:11 +04:00
fb76095378
Merge pull request #610 from AoD314:webp2
2013-03-11 21:13:36 +04:00
9680176fa9
added docs
2013-03-11 15:47:21 +04:00
eb012a5993
added tests for WebP
2013-03-11 11:51:46 +04:00
63d9ee9523
This code is based on https://github.com/prasannatsm/opencv code.
...
- added webp (lossy and lossless without alpha channel)
- added tests
2013-03-11 11:51:38 +04:00
c02f94392b
Add version checks to previous modifications to ffmpeg_cap_impl.hpp
...
Add version checks around uses of AVCodecID and av_opt_set, since these aren't
defined for older versions of ffmpeg.
2013-03-04 22:14:52 -05:00
52137ceed0
Allow encoding with libx264 via ffmpeg to work
...
Add a call to avcodec_get_context_defaults3, this sets per-codec default values
and in the case of libx264 will stop VideoWriter::open (with fourcc=x264) from
failing due to libx264 complaining about broken ffmpeg default settings.
Set some additional libx264 encoder parameters.
2013-03-04 19:29:05 -05:00
9e12b7c3c2
Merge release 2.4.4
2013-03-04 19:43:49 +04:00
df456245e7
fixed ffmpeg destination folder for NMake generator
2013-02-28 10:16:41 +04:00
c5e979ceb7
Merge pull request #581 from vpisarev:ios_fix
2013-02-28 01:58:13 +04:00
11ba220e02
fixed iOS framework compile errors after recent changes
2013-02-28 00:54:01 +04:00
68bb317ce1
Merge pull request #462 from kobigurk:master
2013-02-28 00:38:20 +04:00
2a6fb2867e
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
0b8a6da817
Merge branch '2.4'
2013-02-22 17:33:30 +04:00
e3803f9985
fix for OpenCV issue #2815
...
- libavcodec issue
- some decoders alter AVCodecContext width/height values, in a wrong way
- eg. in issue 2815, vp6f decoder changes these values, resulting in distorted / invalid frames
- this patch forces default AVCodecContext values
2013-02-21 17:37:24 +04:00
a938534a7e
restored binary compatibility
2013-02-21 12:18:08 +04:00
e06c3ec7c5
updated OpenGL functionality:
...
* removed OpenGLFuncTab, now extensions are loaded internally
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
2013-02-19 14:13:11 +04:00
262fc929aa
Merge branch '2.4'
2013-02-18 15:35:42 +04:00
37e2664cf0
Merge pull request #479 from ilya-lavrenov:TestHighGUI
2013-02-14 11:21:01 +04:00
18a5b8dfc6
fixed tab indent
2013-02-13 14:21:34 +02:00
88e0127f44
API of TiffDecoder back to what it was - normalizeChannelsNumber moved to protected
...
test code unified - channels number is tested for other formats as well
2013-02-13 14:13:36 +02:00
109e047a28
* img_test is now tested for channel numbers instead of img
...
* fixed indentation to use spaces and trailing spaces
2013-02-13 13:33:07 +02:00
956aa68fb5
Merge branch '2.4'
2013-02-12 20:30:17 +04:00
ac389507a0
Fix warnings from ffmpeg wrapper
2013-02-12 19:58:59 +04:00
b44b920997
Merge branch '2.4'
2013-02-12 16:30:18 +04:00
5512f91d08
removed libstdc++ dependency
2013-02-12 14:20:23 +04:00
9f80c6c989
added test for 4 channel tiff
2013-02-12 11:21:51 +02:00
5cae645ba1
Temporary disabled parallel_writers_and_readers test
2013-02-11 16:52:20 +04:00
2ed6bc8aaf
Revert ffmpeg related changes from "thread-safe VideoWriter and VideoCapture"
...
This reverts commit 4abf0b3193
2013-02-11 14:15:29 +04:00
7927ebf20e
alpha channels support for 8-bit tiffs
2013-02-10 01:22:49 +02:00
bf575ba7fb
Merge pull request #434 from taka-no-me:fix_parallel_writer_test
2013-02-06 14:04:59 +04:00
c527340cb6
Merge branch 2.4
2013-02-04 17:15:55 +04:00
727b6a7259
Merge pull request #408 from asmorkalov:giganetix_cams_patch
2013-02-04 14:56:54 +04:00
3c39e146a3
Make parallel video writer test pass if compiled without threading support
2013-02-04 14:34:44 +04:00
0cd8684ade
Fix setting of FPS after frame width and height with DShow cameras
...
Issue #2114
2013-02-01 18:01:13 +04:00
75191e8f2f
Smartek Giganetix Cameras support (Patch #2192 ) integrated to master.
2013-02-01 16:54:00 +04:00
25086ed257
Smartek Giganetix Cameras support (Patch #2192 ) integrated.
2013-02-01 16:07:32 +04:00
61079547f0
Merge branch '2.4'
2013-02-01 14:59:40 +04:00
13d2412d24
Merge pull request #394 from taka-no-me:fix_tiff_test
2013-01-31 20:52:35 +04:00
55b90d7bae
Modify decode_tile16384x16384 test to not fail when available memory is not enough for test
2013-01-31 18:51:24 +04:00
fe5b9df45f
Fixed multiple issues in docs (bug #2410 )
2013-01-31 17:34:40 +04:00
57d3152cd0
Merge branch '2.4'
2013-01-31 14:35:27 +04:00
2d6253609c
Fix truncation of fourcc value in dshow capture property setter (bug #2535 )
...
Added test checking that all valid fourcc values are converted properly
2013-01-31 12:00:04 +04:00
9b4f2d1b53
Merge pull request #373 from ilysenkov:bugfix_2440
2013-01-30 19:37:16 +04:00
Andrey Kamaev
Vladislav Vinogradov
AoD314
Charles Otto
Vadim Pisarevsky
gferry
kobigurk
Ilya Lavrenov
Alexander Smorkalov
Daniil Osokin