mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-07-08 04:05:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

define a zm version of av_frame_alloc to clean up code

Browse Source
This commit is contained in:
Isaac Connor
2016-09-20 14:05:25 -04:00
parent d26f3c9a6c
commit 97053df0b1
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/zm_ffmpeg_camera.cpp
View File

@@ -392,18 +392,10 @@ int FfmpegCamera::OpenFfmpeg() {
Debug ( 1, "Opened codec" );
// Allocate space for the native video frame
#if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
mRawFrame = av_frame_alloc();
#else
mRawFrame = avcodec_alloc_frame();
#endif
mRawFrame = zm_av_frame_alloc();
// Allocate space for the converted video frame
#if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
mFrame = av_frame_alloc();
#else
mFrame = avcodec_alloc_frame();
#endif
mFrame = zm_av_frame_alloc();
if(mRawFrame == NULL || mFrame == NULL)
Fatal( "Unable to allocate frame for %s", mPath.c_str() );