generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated new ffmpeg wrapper

Browse Source
This commit is contained in:
Alexander Reshetnikov 2012-03-30 16:57:41 +00:00
parent dc6cad3d4b
commit aff34adf1b
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
View File

@ -961,7 +961,7 @@ static AVStream *icv_add_video_stream_FFMPEG(AVFormatContext *oc,
AVCodec *codec; AVCodec *codec;
st = av_new_stream(oc, 0); st = avformat_new_stream(oc, 0);
if (!st) { if (!st) {
CV_WARN("Could not allocate stream"); CV_WARN("Could not allocate stream");
return NULL; 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 /* set the output parameters (must be done even if no
parameters). */ parameters). */
#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 2, 0) #if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 2, 0)
if (av_set_parameters(oc, NULL) < 0) if (av_set_parameters(oc, NULL) < 0) {
#else
if (avformat_write_header(oc, NULL) < 0)
#endif
{
return false; return false;
} }
#endif
#if FF_API_DUMP_FORMAT #if FF_API_DUMP_FORMAT
dump_format(oc, 0, filename, 1); dump_format(oc, 0, filename, 1);