From 0ef02287ddcd55404144112e4cc6ee522972bea0 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 6 Apr 2016 10:49:42 -0400 Subject: [PATCH] revert --- src/zm_video.cpp | 2 +- src/zm_video.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/zm_video.cpp b/src/zm_video.cpp index 65e4a32e8..82cb75d1d 100644 --- a/src/zm_video.cpp +++ b/src/zm_video.cpp @@ -64,7 +64,7 @@ X264MP4Writer::X264MP4Writer(const char* p_path, const unsigned int p_width, con if(zm_pf == 0) { 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); diff --git a/src/zm_video.h b/src/zm_video.h index 45fe0f078..936adfeb8 100644 --- a/src/zm_video.h +++ b/src/zm_video.h @@ -120,8 +120,8 @@ protected: /* SWScale */ SWScale swscaleobj; - enum PixelFormat zm_pf; - enum PixelFormat codec_pf; + enum _AVPIXELFORMAT zm_pf; + enum _AVPIXELFORMAT codec_pf; size_t codec_imgsize; size_t zm_imgsize;