mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-18 19:46:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into rate_dropdown

Browse Source
This commit is contained in:
Isaac Connor
2020-01-07 14:49:58 -05:00
parent d87bf5a156 c0443f694a
commit 1c197db619
48 changed files with 1101 additions and 884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/zm_ffmpeg_input.cpp
View File

@@ -145,7 +145,11 @@ AVFrame *FFmpeg_Input::get_frame(int stream_id) {
av_frame_free(&frame);
continue;
} else {
zm_dump_frame(frame, "resulting frame");
if ( is_video_stream(input_format_context->streams[packet.stream_index]) ) {
zm_dump_video_frame(frame, "resulting video frame");
} else {
zm_dump_frame(frame, "resulting frame");
}
}
frameComplete = 1;