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

revert

This commit is contained in:
Isaac Connor 2016-04-06 10:49:42 -04:00
parent 222f7755fe
commit 0ef02287dd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_video.cpp
View File

@ -64,7 +64,7 @@ X264MP4Writer::X264MP4Writer(const char* p_path, const unsigned int p_width, con
if(zm_pf == 0) { if(zm_pf == 0) {
Error("Unable to match ffmpeg pixelformat"); Error("Unable to match ffmpeg pixelformat");
} }
codec_pf = PIX_FMT_YUV420P; codec_pf = AV_PIX_FMT_YUV420P;
swscaleobj.SetDefaults(zm_pf, codec_pf, width, height); swscaleobj.SetDefaults(zm_pf, codec_pf, width, height);

4
src/zm_video.h
View File

@ -120,8 +120,8 @@ protected:
/* SWScale */ /* SWScale */
SWScale swscaleobj; SWScale swscaleobj;
enum PixelFormat zm_pf; enum _AVPIXELFORMAT zm_pf;
enum PixelFormat codec_pf; enum _AVPIXELFORMAT codec_pf;
size_t codec_imgsize; size_t codec_imgsize;
size_t zm_imgsize; size_t zm_imgsize;