From 10ee0656b139c76188aab12edb7aa70a203786f3 Mon Sep 17 00:00:00 2001 From: Tristan Matthews <tristan.matthews@savoirfairelinux.com> Date: Thu, 24 Apr 2014 13:31:56 -0400 Subject: [PATCH] video: group libav macros together Refs #45640 Change-Id: If200d52194d175a8bc6dc2741d64118df393790e --- daemon/src/video/libav_deps.h | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/daemon/src/video/libav_deps.h b/daemon/src/video/libav_deps.h index b476dd96e3..5a66a8836b 100644 --- a/daemon/src/video/libav_deps.h +++ b/daemon/src/video/libav_deps.h @@ -39,24 +39,6 @@ ( (LIBAVFORMAT_VERSION_MICRO < 100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \ (LIBAVFORMAT_VERSION_MICRO >= 100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) ) -extern "C" { -#include <libavcodec/avcodec.h> -#include <libavformat/avformat.h> -#include <libavdevice/avdevice.h> -#include <libswscale/swscale.h> -#include <libavutil/avutil.h> -#if LIBAVFORMAT_VERSION_CHECK(54, 6, 0, 60, 100) -#include <libavutil/time.h> -#endif -#include <libavutil/pixdesc.h> -#include <libavutil/opt.h> -#include <libavutil/mathematics.h> // for av_rescale_q (old libav support) -#include <libavutil/imgutils.h> -#include <libavutil/intreadwrite.h> -} - -#include "libav_utils.h" - /* LIBAVCODEC_VERSION_CHECK checks for the right version of libav and FFmpeg * a is the major version * b and c the minor and micro versions of libav @@ -75,6 +57,24 @@ extern "C" { #define HAVE_SDP_CUSTOM_IO LIBAVFORMAT_VERSION_CHECK(54,20,3,59,103) +extern "C" { +#include <libavcodec/avcodec.h> +#include <libavformat/avformat.h> +#include <libavdevice/avdevice.h> +#include <libswscale/swscale.h> +#include <libavutil/avutil.h> +#if LIBAVFORMAT_VERSION_CHECK(54, 6, 0, 60, 100) +#include <libavutil/time.h> +#endif +#include <libavutil/pixdesc.h> +#include <libavutil/opt.h> +#include <libavutil/mathematics.h> // for av_rescale_q (old libav support) +#include <libavutil/imgutils.h> +#include <libavutil/intreadwrite.h> +} + +#include "libav_utils.h" + #if !LIBAVUTIL_VERSION_CHECK(51, 42, 0, 74, 100) && !defined(FF_API_PIX_FMT) #define AVPixelFormat PixelFormat #define PIXEL_FORMAT(FMT) PIX_FMT_ ## FMT -- GitLab