ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed use of av_err2str. someone could not compile when using that macro.

This commit is contained in:
Sune1337 2014-03-21 19:42:03 +01:00 committed by SteveGilvarry
parent a307b8a1e3
commit 7de59df080
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/zm_ffmpeg_camera.cpp
View File

@ -126,16 +126,20 @@ int FfmpegCamera::Capture( Image &image )
int avResult = av_read_frame( mFormatContext, &packet ); int avResult = av_read_frame( mFormatContext, &packet );
if ( avResult < 0 ) if ( avResult < 0 )
{ {
if (avResult == AVERROR_EOF || (mFormatContext->pb && mFormatContext->pb->eof_reached)) char errbuf[AV_ERROR_MAX_STRING_SIZE];
av_strerror(avResult, errbuf, AV_ERROR_MAX_STRING_SIZE);
if (
// Check if EOF.
(avResult == AVERROR_EOF || (mFormatContext->pb && mFormatContext->pb->eof_reached)) ||
// Check for Connection failure.
(avResult == -110)
)
{ {
Info( "av_read_frame returned EOF. Reopening stream." ); Info( "av_read_frame returned \"%s\". Reopening stream.", errbuf);
ReopenFfmpeg(); ReopenFfmpeg();
} else if (avResult == -110) {
Info( "av_read_frame returned \"%s\". Reopening stream.", av_err2str(avResult)) ;
ReopenFfmpeg();
} else {
Error( "Unable to read packet from stream %d: error %d \"%s\".", packet.stream_index, avResult, av_err2str(avResult) );
} }
Error( "Unable to read packet from stream %d: error %d \"%s\".", packet.stream_index, avResult, errbuf );
return( -1 ); return( -1 );
} }
Debug( 5, "Got packet from stream %d", packet.stream_index ); Debug( 5, "Got packet from stream %d", packet.stream_index );