projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b5a9c9a
)
minor changes in wrapper 3
author
Alexander Shishkov
<no@email>
Thu, 15 Mar 2012 20:14:59 +0000
(20:14 +0000)
committer
Alexander Shishkov
<no@email>
Thu, 15 Mar 2012 20:14:59 +0000
(20:14 +0000)
modules/highgui/src/cap_ffmpeg_impl.hpp
patch
|
blob
|
history
diff --git
a/modules/highgui/src/cap_ffmpeg_impl.hpp
b/modules/highgui/src/cap_ffmpeg_impl.hpp
index
7289df9
..
fe68e79
100644
(file)
--- a/
modules/highgui/src/cap_ffmpeg_impl.hpp
+++ b/
modules/highgui/src/cap_ffmpeg_impl.hpp
@@
-1187,7
+1187,7
@@
bool CvVideoWriter_FFMPEG::writeFrame( const unsigned char* data, int step, int
#if LIBAVFORMAT_BUILD > 4628
AVCodecContext *c = video_st->codec;
#else
-
AVCodecContext *c = &(video_st->codec);
+ AVCodecContext *c = &(video_st->codec);
#endif
#if LIBAVFORMAT_BUILD < 5231
@@
-1376,9
+1376,9
@@
bool CvVideoWriter_FFMPEG::open( const char * filename, int fourcc,
close();
// check arguments
-
assert
(filename);
-
assert
(fps > 0);
-
assert
(width > 0 && height > 0);
+
assert
(filename);
+
assert
(fps > 0);
+
assert
(width > 0 && height > 0);
// tell FFMPEG to register codecs
av_register_all ();