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

cppcheck cleanups

This commit is contained in:
Isaac Connor 2021-04-20 11:04:27 -04:00
parent c833833a5e
commit e8b761d2bf
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/zm_ffmpeg_input.cpp
View File

@ -218,21 +218,21 @@ AVFrame *FFmpeg_Input::get_frame(int stream_id, double at) {
int ret;
if ( !frame ) {
if (!frame) {
// Don't have a frame yet, so get a keyframe before the timestamp
ret = av_seek_frame(input_format_context, stream_id, seek_target, AVSEEK_FLAG_FRAME);
if ( ret < 0 ) {
if (ret < 0) {
Error("Unable to seek in stream");
return nullptr;
}
// Have to grab a frame to update our current frame to know where we are
get_frame(stream_id);
} // end if ! frame
if ( !frame ) {
Warning("Unable to get frame.");
return nullptr;
}
if (!frame) {
Warning("Unable to get frame.");
return nullptr;
}
} // end if ! frame
if (
(last_seek_request >= 0)
@ -243,10 +243,10 @@ AVFrame *FFmpeg_Input::get_frame(int stream_id, double at) {
) {
zm_dump_frame(frame, "frame->pts > seek_target, seek backwards");
// our frame must be beyond our seek target. so go backwards to before it
if ( ( ret = av_seek_frame(input_format_context, stream_id, seek_target,
if (( ret = av_seek_frame(input_format_context, stream_id, seek_target,
AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_FRAME
) < 0 ) ) {
Error("Unable to seek in stream");
) ) < 0) {
Error("Unable to seek in stream %d", ret);
return nullptr;
}
// Have to grab a frame to update our current frame to know where we are