diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2015-12-01 20:58:51 -0800 |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2016-01-24 07:31:16 -0800 |
| commit | 61fb70c3866b19dccf473ad4e5ede79d117e8e1c (patch) | |
| tree | cf9a70f34bf039b14e73072a2b95ffd432167a94 | |
| parent | bd4d192081230b217ecab14d39daf06f40067191 (diff) | |
| download | ffmpeg-61fb70c3866b19dccf473ad4e5ede79d117e8e1c.tar.gz | |
decklink: Header cleanup
This commit cleans up the decklink files' header usage so that they pass
checkheaders.
| -rw-r--r-- | libavdevice/decklink_common.cpp | 4 | ||||
| -rw-r--r-- | libavdevice/decklink_common.h | 8 | ||||
| -rw-r--r-- | libavdevice/decklink_common_c.h | 2 | ||||
| -rw-r--r-- | libavdevice/decklink_dec.cpp | 4 | ||||
| -rw-r--r-- | libavdevice/decklink_dec.h | 2 | ||||
| -rw-r--r-- | libavdevice/decklink_enc.cpp | 4 | ||||
| -rw-r--r-- | libavdevice/decklink_enc.h | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp index ac7964cd17..58502eecec 100644 --- a/libavdevice/decklink_common.cpp +++ b/libavdevice/decklink_common.cpp @@ -26,11 +26,7 @@ #include <DeckLinkAPIDispatch.cpp> #endif -#include <pthread.h> -#include <semaphore.h> - extern "C" { -#include "libavformat/avformat.h" #include "libavformat/internal.h" #include "libavutil/imgutils.h" } diff --git a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h index 3bc30f062c..c7e3ef2e39 100644 --- a/libavdevice/decklink_common.h +++ b/libavdevice/decklink_common.h @@ -19,9 +19,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <DeckLinkAPIVersion.h> +#include <pthread.h> +#include <semaphore.h> +#include <DeckLinkAPI.h> + +extern "C" { +#include "libavformat/avformat.h" #include "decklink_common_c.h" +} class decklink_output_callback; class decklink_input_callback; diff --git a/libavdevice/decklink_common_c.h b/libavdevice/decklink_common_c.h index fb2b788628..3644fb4dd8 100644 --- a/libavdevice/decklink_common_c.h +++ b/libavdevice/decklink_common_c.h @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/log.h" + struct decklink_cctx { const AVClass *cclass; diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 6c5bc5dbed..4bbc92edea 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -21,11 +21,7 @@ #include <DeckLinkAPI.h> -#include <pthread.h> -#include <semaphore.h> - extern "C" { -#include "libavformat/avformat.h" #include "libavformat/internal.h" #include "libavutil/imgutils.h" } diff --git a/libavdevice/decklink_dec.h b/libavdevice/decklink_dec.h index 6bd9226cd0..c499bc9adf 100644 --- a/libavdevice/decklink_dec.h +++ b/libavdevice/decklink_dec.h @@ -23,6 +23,8 @@ extern "C" { #endif +#include "libavformat/avformat.h" + int ff_decklink_read_header(AVFormatContext *avctx); int ff_decklink_read_packet(AVFormatContext *avctx, AVPacket *pkt); int ff_decklink_read_close(AVFormatContext *avctx); diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp index 6c5450f4ec..334c3dcd33 100644 --- a/libavdevice/decklink_enc.cpp +++ b/libavdevice/decklink_enc.cpp @@ -21,11 +21,7 @@ #include <DeckLinkAPI.h> -#include <pthread.h> -#include <semaphore.h> - extern "C" { -#include "libavformat/avformat.h" #include "libavformat/internal.h" #include "libavutil/imgutils.h" } diff --git a/libavdevice/decklink_enc.h b/libavdevice/decklink_enc.h index 6086947e6c..23c59a2041 100644 --- a/libavdevice/decklink_enc.h +++ b/libavdevice/decklink_enc.h @@ -23,6 +23,8 @@ extern "C" { #endif +#include "libavformat/avformat.h" + int ff_decklink_write_header(AVFormatContext *avctx); int ff_decklink_write_packet(AVFormatContext *avctx, AVPacket *pkt); int ff_decklink_write_trailer(AVFormatContext *avctx); |