Andrey Kamaev
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
Andrey Kamaev
eb3c9ed1ab
Fix ffmpeg wrapper compatibility with libavcodec > 53.25.0
...
Based on pull request #685
2013-04-04 11:27:43 +04:00
Andrey Kamaev
14d27112e9
Fix build of ffmpeg wrapper with some versions of avutil
2013-03-14 14:52:13 +04:00
Andrey Kamaev
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
Charles Otto
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
Charles Otto
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
Andrey Kamaev
0b8a6da817
Merge branch '2.4'
2013-02-22 17:33:30 +04:00
gferry
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
Andrey Kamaev
262fc929aa
Merge branch '2.4'
2013-02-18 15:35:42 +04:00
Andrey Kamaev
37e2664cf0
Merge pull request #479 from ilya-lavrenov:TestHighGUI
2013-02-14 11:21:01 +04:00
Andrey Kamaev
ac389507a0
Fix warnings from ffmpeg wrapper
2013-02-12 19:58:59 +04: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
2013-02-11 14:15:29 +04:00
Ilya Lavrenov
4abf0b3193
thread-safe VideoWriter and VideoCapture
2012-11-19 16:44:23 +04:00
Vadim Pisarevsky
4e07561141
fixed possible compile error in cap_ffmpeg_impl.hpp (bug #2365 )
2012-09-19 16:48:19 +04:00
Vadim Pisarevsky
2367a195c5
probably fixed compile error on MacOSX 10.6
2012-08-31 14:35:11 +04:00
Vadim Pisarevsky
633a8bfacc
fixed many warnings (modified pull request 13)
2012-08-28 18:15:14 +04:00
Andrey Kamaev
49a1ba6038
Set stricter warning rules for gcc
2012-06-07 17:21:29 +00:00
Vadim Pisarevsky
677680d82d
reverted the original VideoCapture::read() code; moved frame index check to where it should belong: ffmpeg wrapper; applied patch by Rob Reilink (ticket #1971 )
2012-06-01 08:55:16 +00:00
Alexander Reshetnikov
3ec43a11ed
Fixed read error in VideoCapture for images (bug #1892 ); minor fix of ffmpeg wrapper warning
2012-05-05 14:43:03 +00:00
Vladislav Vinogradov
ca57239618
fixed some problems after r8280 (lost code)
2012-05-02 13:07:30 +00:00
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
Vladislav Vinogradov
f4b4665940
added VideoReader_GPU
2012-04-18 11:18:25 +00:00
Vladislav Vinogradov
70909738f4
added support of different surface formats to VideoWriter_GPU
...
added key frame handling to ffmpeg wrappers
2012-04-17 11:08:08 +00:00
Vladislav Vinogradov
2bfaf540a1
added VideoWriter_GPU
2012-04-17 07:12:16 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Alexander Reshetnikov
4ec2ad91b9
Removed duplicated includes from ffmpeg wrappers
2012-03-31 15:27:48 +00:00
Alexander Reshetnikov
e00f1e3911
Fixed a problem with CODEC_ID_RAWVIDEO in FFMPEG (ticket #1400 )
2012-03-30 14:30:24 +00:00
Alexander Reshetnikov
1d7e09a9d5
Removed duplicated ifdef code from ffmpeg wrappers
2012-03-26 13:51:05 +00:00
Alexander Shishkov
84ddd6018d
fixed wrapper compilation on Windows (opencv_ffmpeg dlls)
2012-03-23 10:52:36 +00:00
Alexander Reshetnikov
b27d1662e6
Separated ffmpeg codecs and wrappers
2012-03-22 21:28:06 +00:00
Alexander Shishkov
7f2ddf16eb
minor changes in wrapper 5
2012-03-15 20:39:11 +00:00
Alexander Shishkov
6546719158
minor changes in wrapper 4
2012-03-15 20:30:21 +00:00
Alexander Shishkov
a12fb7f96c
minor changes in wrapper 3
2012-03-15 20:14:59 +00:00
Alexander Shishkov
538eeeab1d
minor changes in wrapper 2
2012-03-15 15:43:14 +00:00
Alexander Shishkov
10b0f29372
minor changes in wrapper
2012-03-15 15:36:14 +00:00
Alexander Shishkov
bf4df828f7
minor changes in wrapper
2012-03-15 15:30:01 +00:00
Alexander Shishkov
7b3ec537b4
minor changes in wrapper
2012-03-15 15:12:52 +00:00
Alexander Shishkov
0ea66a38ff
fixed compilation FFMPEG wrapper on Windows
2012-03-15 07:22:31 +00:00
Alexander Shishkov
50df95650a
fixed #924
2012-02-22 12:16:01 +00:00
Alexander Shishkov
f7866677eb
fixed #1615
2012-02-22 12:13:56 +00:00
Alexander Reshetnikov
f83aa74bc4
Updated ffmpeg implementation (setProperty & getProperty methods)
2012-02-18 12:56:00 +00:00
Andrey Morozov
386578bc3f
fixed compile error
2012-02-01 09:54:18 +00:00
Alexander Reshetnikov
a41b0902f4
Prepared some videos for future tests. Added first version of common positioning video test.
2012-01-31 21:02:05 +00:00
Andrey Morozov
196ac49fcf
fixed of the ticket #1442
2012-01-26 11:36:12 +00:00
Vadim Pisarevsky
325e0b1ab8
fixed ffmpeg backend build on Ubuntu 11.10
2011-11-04 16:44:52 +00:00
Andrey Morozov
bba4f9e5d6
removed property. added automatically define number of cpus for decoding video
2011-08-02 14:27:21 +00:00
Andrey Morozov
d0176d69f2
fixed property for ffmpeg
2011-08-01 16:05:34 +00:00
Andrey Morozov
c697f6a3f8
fixed build ffmpeg v0.8.1
2011-07-31 17:34:31 +00:00
Andrey Morozov
c55a37ad7c
fixed build with ffmpeg 0.5.X
2011-07-30 10:26:37 +00:00
