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
7852b68c
Commit
7852b68c
authored
Dec 04, 2012
by
Vadim Pisarevsky
Committed by
OpenCV Buildbot
Dec 04, 2012
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #197 from asmorkalov:ffmpeg_status_message_fix
parents
f6ca38a5
6e0db3f5
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
16 deletions
+10
-16
cap_ffmpeg.cpp
modules/highgui/src/cap_ffmpeg.cpp
+10
-16
No files found.
modules/highgui/src/cap_ffmpeg.cpp
View file @
7852b68c
...
@@ -114,24 +114,18 @@ private:
...
@@ -114,24 +114,18 @@ private:
icvWriteFrame_FFMPEG_p
=
icvWriteFrame_FFMPEG_p
=
(
CvWriteFrame_Plugin
)
GetProcAddress
(
icvFFOpenCV
,
"cvWriteFrame_FFMPEG"
);
(
CvWriteFrame_Plugin
)
GetProcAddress
(
icvFFOpenCV
,
"cvWriteFrame_FFMPEG"
);
#if 0
if
(
icvCreateFileCapture_FFMPEG_p
==
NULL
||
if( icvCreateFileCapture_FFMPEG_p != 0 &&
icvReleaseCapture_FFMPEG_p
==
NULL
||
icvReleaseCapture_FFMPEG_p != 0 &&
icvGrabFrame_FFMPEG_p
==
NULL
||
icvGrabFrame_FFMPEG_p != 0 &&
icvRetrieveFrame_FFMPEG_p
==
NULL
||
icvRetrieveFrame_FFMPEG_p != 0 &&
icvSetCaptureProperty_FFMPEG_p
==
NULL
||
icvSetCaptureProperty_FFMPEG_p != 0 &&
icvGetCaptureProperty_FFMPEG_p
==
NULL
||
icvGetCaptureProperty_FFMPEG_p != 0 &&
icvCreateVideoWriter_FFMPEG_p
==
NULL
||
icvCreateVideoWriter_FFMPEG_p != 0 &&
icvReleaseVideoWriter_FFMPEG_p
==
NULL
||
icvReleaseVideoWriter_FFMPEG_p != 0 &&
icvWriteFrame_FFMPEG_p
==
NULL
)
icvWriteFrame_FFMPEG_p != 0 )
{
{
printf("Successfully initialized ffmpeg plugin!\n"
);
fprintf
(
stderr
,
"Failed to load FFMPEG plugin: module handle=%p
\n
"
,
icvFFOpenCV
);
}
}
else
{
printf("Failed to load FFMPEG plugin: module handle=%p\n", icvFFOpenCV);
}
#endif
}
}
#elif defined HAVE_FFMPEG
#elif defined HAVE_FFMPEG
icvCreateFileCapture_FFMPEG_p
=
(
CvCreateFileCapture_Plugin
)
cvCreateFileCapture_FFMPEG
;
icvCreateFileCapture_FFMPEG_p
=
(
CvCreateFileCapture_Plugin
)
cvCreateFileCapture_FFMPEG
;
...
...
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