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

handle ffmpeg deprecations

This commit is contained in:
Isaac Connor 2017-05-20 08:22:08 -04:00
parent 7caeee6bf8
commit 53abc14143
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/zm_video.cpp
View File

@ -70,7 +70,11 @@ X264MP4Writer::X264MP4Writer(const char* p_path, const unsigned int p_width, con
/* Calculate the image sizes. We will need this for parameter checking */ /* Calculate the image sizes. We will need this for parameter checking */
zm_imgsize = colours * width * height; zm_imgsize = colours * width * height;
#if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
codec_imgsize = av_image_get_buffer_size( codec_pf, width, height, 1 );
#else
codec_imgsize = avpicture_get_size( codec_pf, width, height); codec_imgsize = avpicture_get_size( codec_pf, width, height);
#endif
if(!codec_imgsize) { if(!codec_imgsize) {
Error("Failed calculating codec pixel format image size"); Error("Failed calculating codec pixel format image size");
} }