Merge pull request #197 from asmorkalov:ffmpeg_status_message_fix

pull/208/head
Vadim Pisarevsky 12 years ago committed by OpenCV Buildbot
commit 7852b68c20
  1. 26
      modules/highgui/src/cap_ffmpeg.cpp

@ -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;

Loading…
Cancel
Save