ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix non hwaccel build

pull/2077/head
Isaac Connor 2017-08-22 10:47:37 -04:00
parent 676c4b7ddc
commit e98ea0b891
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/zm_ffmpeg_camera.cpp
View File

@ -747,7 +747,11 @@ int FfmpegCamera::CaptureAndRecord( Image &image, timeval recording, char* event
} }
if ( mVideoCodecContext->codec_id != AV_CODEC_ID_H264 ) { if ( mVideoCodecContext->codec_id != AV_CODEC_ID_H264 ) {
Error( "Input stream is not h264. The stored event file may not be viewable in browser." ); if ( mVideoCodecContext->codec_id == AV_CODEC_ID_H265 ) {
Debug( 1, "Input stream appears to be h265. The stored event file may not be viewable in browser." );
} else {
Error( "Input stream is not h264. The stored event file may not be viewable in browser." );
}
} }
int frameComplete = false; int frameComplete = false;
@ -936,6 +940,7 @@ else if ( packet.pts && video_last_pts > packet.pts ) {
zm_av_packet_unref( &packet ); zm_av_packet_unref( &packet );
continue; continue;
} }
#if HAVE_AVUTIL_HWCONTEXT_H
if ( hwaccel ) { if ( hwaccel ) {
ret = avcodec_receive_frame( mVideoCodecContext, hwFrame ); ret = avcodec_receive_frame( mVideoCodecContext, hwFrame );
if ( ret < 0 ) { if ( ret < 0 ) {
@ -952,6 +957,7 @@ else if ( packet.pts && video_last_pts > packet.pts ) {
continue; continue;
} }
} else { } else {
#endif
ret = avcodec_receive_frame( mVideoCodecContext, mRawFrame ); ret = avcodec_receive_frame( mVideoCodecContext, mRawFrame );
if ( ret < 0 ) { if ( ret < 0 ) {
av_strerror( ret, errbuf, AV_ERROR_MAX_STRING_SIZE ); av_strerror( ret, errbuf, AV_ERROR_MAX_STRING_SIZE );
@ -960,7 +966,9 @@ else if ( packet.pts && video_last_pts > packet.pts ) {
continue; continue;
} }
#if HAVE_AVUTIL_HWCONTEXT_H
} }
#endif
frameComplete = 1; frameComplete = 1;
# else # else