Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
aff34adf
Commit
aff34adf
authored
Mar 30, 2012
by
Alexander Reshetnikov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated new ffmpeg wrapper
parent
dc6cad3d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
6 deletions
+3
-6
cap_ffmpeg_impl_v2.hpp
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
+3
-6
No files found.
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
View file @
aff34adf
...
...
@@ -961,7 +961,7 @@ static AVStream *icv_add_video_stream_FFMPEG(AVFormatContext *oc,
AVCodec
*
codec
;
st
=
av_new_stream
(
oc
,
0
);
st
=
av
format
_new_stream
(
oc
,
0
);
if
(
!
st
)
{
CV_WARN
(
"Could not allocate stream"
);
return
NULL
;
...
...
@@ -1391,13 +1391,10 @@ bool CvVideoWriter_FFMPEG::open( const char * filename, int fourcc,
/* set the output parameters (must be done even if no
parameters). */
#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 2, 0)
if
(
av_set_parameters
(
oc
,
NULL
)
<
0
)
#else
if
(
avformat_write_header
(
oc
,
NULL
)
<
0
)
#endif
{
if
(
av_set_parameters
(
oc
,
NULL
)
<
0
)
{
return
false
;
}
#endif
#if FF_API_DUMP_FORMAT
dump_format
(
oc
,
0
,
filename
,
1
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment