Skip to content

Commit

Permalink
use angle-bracket include form for FFmpeg headers
Browse files Browse the repository at this point in the history
  • Loading branch information
Rechi committed Mar 7, 2019
1 parent 7efb8a6 commit 7b5e3c2
Show file tree
Hide file tree
Showing 77 changed files with 145 additions and 145 deletions.
2 changes: 1 addition & 1 deletion xbmc/addons/PVRClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <memory>

extern "C" {
#include "libavcodec/avcodec.h"
#include <libavcodec/avcodec.h>
}

#include "ServiceBroker.h"
Expand Down
6 changes: 3 additions & 3 deletions xbmc/cdrip/EncoderFFmpeg.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
#include "IEncoder.h"

extern "C" {
#include "libavformat/avformat.h"
#include "libavcodec/avcodec.h"
#include "libswresample/swresample.h"
#include <libavformat/avformat.h>
#include <libavcodec/avcodec.h>
#include <libswresample/swresample.h>
}

class CEncoderFFmpeg : public IEncoder
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "cores/AudioEngine/Interfaces/AEEncoder.h"

extern "C" {
#include "libswresample/swresample.h"
#include <libswresample/swresample.h>
}

/* ffmpeg re-defines this, so undef it to squash the warning */
Expand Down
6 changes: 3 additions & 3 deletions xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@

// ffmpeg
extern "C" {
#include "libavformat/avformat.h"
#include "libavcodec/avcodec.h"
#include "libavutil/avutil.h"
#include <libavformat/avformat.h>
#include <libavcodec/avcodec.h>
#include <libavutil/avutil.h>
}

class IAESink;
Expand Down
4 changes: 2 additions & 2 deletions xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#include <memory>

extern "C" {
#include "libavutil/avutil.h"
#include "libswresample/swresample.h"
#include <libavutil/avutil.h>
#include <libswresample/swresample.h>
}

namespace ActiveAE
Expand Down
10 changes: 5 additions & 5 deletions xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEFilter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
#include <algorithm>

extern "C" {
#include "libavfilter/avfilter.h"
#include "libavcodec/avcodec.h"
#include "libavfilter/buffersink.h"
#include "libavfilter/buffersrc.h"
#include "libswresample/swresample.h"
#include <libavfilter/avfilter.h>
#include <libavcodec/avcodec.h>
#include <libavfilter/buffersink.h>
#include <libavfilter/buffersrc.h>
#include <libswresample/swresample.h>
}

using namespace ActiveAE;
Expand Down
4 changes: 2 additions & 2 deletions xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#pragma once

extern "C" {
#include "libavfilter/avfilter.h"
#include "libavutil/frame.h"
#include <libavfilter/avfilter.h>
#include <libavutil/frame.h>
}

struct SwrContext;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
#include "utils/log.h"

extern "C" {
#include "libavutil/channel_layout.h"
#include "libavutil/opt.h"
#include "libswresample/swresample.h"
#include <libavutil/channel_layout.h>
#include <libavutil/opt.h>
#include <libswresample/swresample.h>
}

using namespace ActiveAE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "cores/AudioEngine/Interfaces/AEResample.h"

extern "C" {
#include "libavutil/samplefmt.h"
#include <libavutil/samplefmt.h>
}

struct SwrContext;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
#include "platform/linux/RBP.h"

extern "C" {
#include "libavutil/channel_layout.h"
#include "libavutil/opt.h"
#include "libswresample/swresample.h"
#include <libavutil/channel_layout.h>
#include <libavutil/opt.h>
#include <libswresample/swresample.h>
}

//#define DEBUG_VERBOSE
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESound.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "utils/log.h"

extern "C" {
#include "libavutil/avutil.h"
#include <libavutil/avutil.h>
}

using namespace ActiveAE;
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/AudioEngine/Interfaces/AE.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "cores/AudioEngine/Utils/AEAudioFormat.h"

extern "C" {
#include "libavutil/samplefmt.h"
#include <libavutil/samplefmt.h>
}

typedef std::pair<std::string, std::string> AEDevice;
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/AudioEngine/Interfaces/AEEncoder.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "cores/AudioEngine/Utils/AEAudioFormat.h"

extern "C" {
#include "libavcodec/avcodec.h"
#include <libavcodec/avcodec.h>
}

/**
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/AudioEngine/Interfaces/AEStream.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <stdint.h>

extern "C" {
#include "libavcodec/avcodec.h"
#include <libavcodec/avcodec.h>
}

class IAudioCallback;
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/AudioEngine/Utils/AEStreamInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#undef restrict

extern "C" {
#include "libavutil/crc.h"
#include <libavutil/crc.h>
}

class CAEStreamInfo
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/AudioEngine/Utils/AEUtil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <cassert>

extern "C" {
#include "libavutil/channel_layout.h"
#include <libavutil/channel_layout.h>
}

/* declare the rng seed and initialize it */
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/AudioEngine/Utils/AEUtil.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <math.h>

extern "C" {
#include "libavutil/samplefmt.h"
#include <libavutil/samplefmt.h>
}

#if defined(HAVE_SSE) && defined(__SSE__)
Expand Down
14 changes: 7 additions & 7 deletions xbmc/cores/FFmpeg.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
#include "utils/CPUInfo.h"

extern "C" {
#include "libavcodec/avcodec.h"
#include "libavformat/avformat.h"
#include "libavutil/avutil.h"
#include "libavutil/log.h"
#include "libavutil/ffversion.h"
#include "libavfilter/avfilter.h"
#include "libpostproc/postprocess.h"
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
#include <libavutil/avutil.h>
#include <libavutil/log.h>
#include <libavutil/ffversion.h>
#include <libavfilter/avfilter.h>
#include <libpostproc/postprocess.h>
}

inline int PPCPUFlags()
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/RetroPlayer/buffers/IRenderBuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#pragma once

extern "C" {
#include "libavutil/pixfmt.h"
#include <libavutil/pixfmt.h>
}

#include <memory>
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/RetroPlayer/buffers/IRenderBufferPool.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#pragma once

extern "C" {
#include "libavutil/pixfmt.h"
#include <libavutil/pixfmt.h>
}

#include <memory>
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/RetroPlayer/buffers/video/RenderBufferSysMem.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <vector>

extern "C" {
#include "libavutil/pixfmt.h"
#include <libavutil/pixfmt.h>
}

namespace KODI
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/RetroPlayer/process/RPProcessInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "windowing/WinSystem.h"

extern "C" {
#include "libavutil/pixdesc.h"
#include <libavutil/pixdesc.h>
}

#include <utility>
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/RetroPlayer/process/RPProcessInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "cores/GameSettings.h"
#include "threads/CriticalSection.h"

#include "libavutil/pixfmt.h"
#include <libavutil/pixfmt.h>

#include <memory>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/RetroPlayer/rendering/RPRenderManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "utils/log.h"

extern "C" {
#include "libswscale/swscale.h"
#include <libswscale/swscale.h>
}

#include <algorithm>
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/RetroPlayer/rendering/RPRenderManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "threads/CriticalSection.h"

extern "C" {
#include "libavutil/pixfmt.h"
#include <libavutil/pixfmt.h>
}

#include <atomic>
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/RetroPlayer/rendering/RenderTranslator.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "cores/GameSettings.h"

#include "libavutil/pixfmt.h"
#include <libavutil/pixfmt.h>

namespace KODI
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "utils/Geometry.h"

extern "C" {
#include "libavutil/pixfmt.h"
#include <libavutil/pixfmt.h>
}

#include <array>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

extern "C"
{
#include "libswscale/swscale.h"
#include <libswscale/swscale.h>
}

#include <cstring>
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/RetroPlayer/streams/RetroPlayerVideo.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "IRetroPlayerStream.h"

extern "C" {
#include "libavutil/pixfmt.h"
#include <libavutil/pixfmt.h>
}

namespace KODI
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/VideoPlayer/AudioSinkAE.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <atomic>

extern "C" {
#include "libavcodec/avcodec.h"
#include <libavcodec/avcodec.h>
}

typedef struct stDVDAudioFrame DVDAudioFrame;
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodec.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <vector>

extern "C" {
#include "libavcodec/avcodec.h"
#include <libavcodec/avcodec.h>
}

struct AVStream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "cores/AudioEngine/Utils/AEUtil.h"

extern "C" {
#include "libavutil/opt.h"
#include <libavutil/opt.h>
}

CDVDAudioCodecFFmpeg::CDVDAudioCodecFFmpeg(CProcessInfo &processInfo) : CDVDAudioCodec(processInfo)
Expand Down
12 changes: 6 additions & 6 deletions xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
#include "DVDAudioCodec.h"

extern "C" {
#include "libavcodec/avcodec.h"
#include "libavformat/avformat.h"
#include "libavutil/avutil.h"
#include "libavutil/channel_layout.h"
#include "libswresample/swresample.h"
#include "libavutil/downmix_info.h"
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
#include <libavutil/avutil.h>
#include <libavutil/channel_layout.h>
#include <libswresample/swresample.h>
#include <libavutil/downmix_info.h>
}

class CProcessInfo;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <algorithm>

extern "C" {
#include "libavcodec/avcodec.h"
#include <libavcodec/avcodec.h>
}

#define TRUEHD_BUF_SIZE 61440
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "Util.h"

extern "C" {
#include "libswscale/swscale.h"
#include <libswscale/swscale.h>
}

bool CDVDCodecUtils::IsVP3CompatibleWidth(int width)
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <vector>

extern "C" {
#include "libavutil/pixfmt.h"
#include <libavutil/pixfmt.h>
}

class CDVDVideoCodec;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include "DVDOverlayCodec.h"

extern "C" {
#include "libavcodec/avcodec.h"
#include "libavutil/avutil.h"
#include <libavcodec/avcodec.h>
#include <libavutil/avutil.h>
}

class CDVDOverlaySpu;
Expand Down
4 changes: 2 additions & 2 deletions xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#include "DVDResource.h"

extern "C" {
#include "libavcodec/avcodec.h"
#include "libavutil/mastering_display_metadata.h"
#include <libavcodec/avcodec.h>
#include <libavutil/mastering_display_metadata.h>
}

#include <vector>
Expand Down
Loading

0 comments on commit 7b5e3c2

Please sign in to comment.