mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-20 23:02:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-h264-videostorage' into storageareas

Browse Source
This commit is contained in:
Isaac Connor
2016-09-13 09:53:39 -04:00
parent 5fb1c45c4e 39e06b929f
commit 2bc5742aec
7 changed files with 51 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/zm_ffmpeg.cpp
View File

@@ -203,10 +203,10 @@ int SWScale::Convert(const uint8_t* in_buffer, const size_t in_buffer_size, uint
// Error("Invalid input or output pixel formats");
// return -2;
// }
// if(!width || !height) {
// Error("Invalid width or height");
// return -3;
// }
if (!width || !height) {
Error("Invalid width or height");
return -3;
}
#if LIBSWSCALE_VERSION_CHECK(0, 8, 0, 8, 0)
/* Warn if the input or output pixelformat is not supported */