From 41524e461cb1d82c1b3406f5e492e6fb4a3e7ba5 Mon Sep 17 00:00:00 2001 From: Tristan Matthews Date: Tue, 8 Oct 2013 18:29:58 -0400 Subject: [PATCH] * #31474: video: fix macros/placement --- daemon/src/video/video_encoder.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/src/video/video_encoder.cpp b/daemon/src/video/video_encoder.cpp index 7c1cf315f..d1fbafadb 100644 --- a/daemon/src/video/video_encoder.cpp +++ b/daemon/src/video/video_encoder.cpp @@ -145,7 +145,7 @@ int VideoEncoder::openOutput(const char *enc_name, const char *short_name, return -1; } -#if LIBAVCODEC_VERSION_MAJOR < 54 +#if (LIBAVCODEC_VERSION_MAJOR < 54) encoderBufferSize_ = scaledFrameBufferSize_; // seems to be ok encoderBuffer_ = (uint8_t*) av_malloc(encoderBufferSize_); if (!encoderBuffer_) { @@ -281,8 +281,8 @@ int VideoEncoder::flush() AVPacket pkt = {}; av_init_packet(&pkt); -#if (LIBAVCODEC_VERSION_MAJOR >= 54) int ret; +#if (LIBAVCODEC_VERSION_MAJOR >= 54) int got_packet;