@@ -26,7 +26,11 @@

 #include <DeckLinkAPIDispatch.cpp>

 #endif

+#include <pthread.h>

+#include <semaphore.h>

+

 extern "C" {

+#include "libavformat/avformat.h"

 #include "libavformat/internal.h"

 #include "libavutil/imgutils.h"

 }

@@ -19,15 +19,9 @@

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

-#include <pthread.h>

-#include <semaphore.h>

-#include <DeckLinkAPI.h>

-

-extern "C" {

-#include "libavformat/avformat.h"

+#include <DeckLinkAPIVersion.h>

 #include "decklink_common_c.h"

-}

 class decklink_output_callback;

 class decklink_input_callback;

@@ -19,8 +19,6 @@

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

-#include "libavutil/log.h"

-

 struct decklink_cctx {

     const AVClass *cclass;

@@ -21,7 +21,11 @@

 #include <DeckLinkAPI.h>

+#include <pthread.h>

+#include <semaphore.h>

+

 extern "C" {

+#include "libavformat/avformat.h"

 #include "libavformat/internal.h"

 #include "libavutil/imgutils.h"

 }

@@ -23,8 +23,6 @@

 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);

@@ -21,7 +21,11 @@

 #include <DeckLinkAPI.h>

+#include <pthread.h>

+#include <semaphore.h>

+

 extern "C" {

+#include "libavformat/avformat.h"

 #include "libavformat/internal.h"

 #include "libavutil/imgutils.h"

 }

@@ -23,8 +23,6 @@

 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);