decklink: Header cleanup

This commit cleans up the decklink files' header usage so that they pass checkheaders.

Timothy Gu committed 10 years ago

Commit 61fb70c1 parent bd4d1927 files · +13 −13Browse files

Unified · Split

7 files

libavdevice/decklink_common.cpp +0 −4
libavdevice/decklink_common.h +7 −1
libavdevice/decklink_common_c.h +2 −0
libavdevice/decklink_dec.cpp +0 −4
libavdevice/decklink_dec.h +2 −0
libavdevice/decklink_enc.cpp +0 −4
libavdevice/decklink_enc.h +2 −0

libavdevice/decklink_common.cpp+0−4

@@ -26,11 +26,7 @@ · 25 unmodified lines
26	26	#include <DeckLinkAPIDispatch.cpp>
27	27	#endif
28	28
29		−#include <pthread.h>
30		−#include <semaphore.h>
31		−
32	29	extern "C" {
33		−#include "libavformat/avformat.h"
34	30	#include "libavformat/internal.h"
35	31	#include "libavutil/imgutils.h"
36	32	}

libavdevice/decklink_common.h+7−1

@@ -19,9 +19,15 @@ · 18 unmodified lines
19	19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20	20	*/
21	21
22		−#include <DeckLinkAPIVersion.h>
	22	+#include <pthread.h>
	23	+#include <semaphore.h>
	24	+#include <DeckLinkAPI.h>
	25	+
	26	+extern "C" {
	27	+#include "libavformat/avformat.h"
23	28
24	29	#include "decklink_common_c.h"
	30	+}
25	31
26	32	class decklink_output_callback;
27	33	class decklink_input_callback;

libavdevice/decklink_common_c.h+2−0

@@ -19,6 +19,8 @@ · 18 unmodified lines
19	19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20	20	*/
21	21
	22	+#include "libavutil/log.h"
	23	+
22	24	struct decklink_cctx {
23	25	const AVClass *cclass;
24	26

libavdevice/decklink_dec.cpp+0−4

@@ -21,11 +21,7 @@ · 20 unmodified lines
21	21
22	22	#include <DeckLinkAPI.h>
23	23
24		−#include <pthread.h>
25		−#include <semaphore.h>
26		−
27	24	extern "C" {
28		−#include "libavformat/avformat.h"
29	25	#include "libavformat/internal.h"
30	26	#include "libavutil/imgutils.h"
31	27	}

libavdevice/decklink_dec.h+2−0

@@ -23,6 +23,8 @@ · 22 unmodified lines
23	23	extern "C" {
24	24	#endif
25	25
	26	+#include "libavformat/avformat.h"
	27	+
26	28	int ff_decklink_read_header(AVFormatContext *avctx);
27	29	int ff_decklink_read_packet(AVFormatContext avctx, AVPacket pkt);
28	30	int ff_decklink_read_close(AVFormatContext *avctx);

libavdevice/decklink_enc.cpp+0−4

@@ -21,11 +21,7 @@ · 20 unmodified lines
21	21
22	22	#include <DeckLinkAPI.h>
23	23
24		−#include <pthread.h>
25		−#include <semaphore.h>
26		−
27	24	extern "C" {
28		−#include "libavformat/avformat.h"
29	25	#include "libavformat/internal.h"
30	26	#include "libavutil/imgutils.h"
31	27	}

libavdevice/decklink_enc.h+2−0

@@ -23,6 +23,8 @@ · 22 unmodified lines
23	23	extern "C" {
24	24	#endif
25	25
	26	+#include "libavformat/avformat.h"
	27	+
26	28	int ff_decklink_write_header(AVFormatContext *avctx);
27	29	int ff_decklink_write_packet(AVFormatContext avctx, AVPacket pkt);
28	30	int ff_decklink_write_trailer(AVFormatContext *avctx);