History

Revert "decklink: Header cleanup"

This reverts commit 61fb70c3866b19dccf473ad4e5ede79d117e8e1c. Reported in #5183 to break the build. Further investigation needed.

Timothy Gu committed 10 years ago

Commit ce36cb01 parent f42eae97 files · +13 −13Browse files

Unified · Split

7 files
  1. libavdevice/decklink_common.cpp +4 −0
  2. libavdevice/decklink_common.h +1 −7
  3. libavdevice/decklink_common_c.h +0 −2
  4. libavdevice/decklink_dec.cpp +4 −0
  5. libavdevice/decklink_dec.h +0 −2
  6. libavdevice/decklink_enc.cpp +4 −0
  7. libavdevice/decklink_enc.h +0 −2
libavdevice/decklink_common.cpp+4−0
@@ -26,7 +26,11 @@ · 25 unmodified lines
2626 #include <DeckLinkAPIDispatch.cpp>
2727 #endif
2828
29+#include <pthread.h>
30+#include <semaphore.h>
31+
2932 extern "C" {
33+#include "libavformat/avformat.h"
3034 #include "libavformat/internal.h"
3135 #include "libavutil/imgutils.h"
3236 }
libavdevice/decklink_common.h+1−7
@@ -19,15 +19,9 @@ · 18 unmodified lines
1919 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2020 */
2121
22−#include <pthread.h>
23−#include <semaphore.h>
24−#include <DeckLinkAPI.h>
25−
26−extern "C" {
27−#include "libavformat/avformat.h"
22+#include <DeckLinkAPIVersion.h>
2823
2924 #include "decklink_common_c.h"
30−}
3125
3226 class decklink_output_callback;
3327 class decklink_input_callback;
libavdevice/decklink_common_c.h+0−2
@@ -19,8 +19,6 @@ · 18 unmodified lines
1919 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2020 */
2121
22−#include "libavutil/log.h"
23−
2422 struct decklink_cctx {
2523 const AVClass *cclass;
2624
libavdevice/decklink_dec.cpp+4−0
@@ -21,7 +21,11 @@ · 20 unmodified lines
2121
2222 #include <DeckLinkAPI.h>
2323
24+#include <pthread.h>
25+#include <semaphore.h>
26+
2427 extern "C" {
28+#include "libavformat/avformat.h"
2529 #include "libavformat/internal.h"
2630 #include "libavutil/imgutils.h"
2731 }
libavdevice/decklink_dec.h+0−2
@@ -23,8 +23,6 @@ · 22 unmodified lines
2323 extern "C" {
2424 #endif
2525
26−#include "libavformat/avformat.h"
27−
2826 int ff_decklink_read_header(AVFormatContext *avctx);
2927 int ff_decklink_read_packet(AVFormatContext *avctx, AVPacket *pkt);
3028 int ff_decklink_read_close(AVFormatContext *avctx);
libavdevice/decklink_enc.cpp+4−0
@@ -21,7 +21,11 @@ · 20 unmodified lines
2121
2222 #include <DeckLinkAPI.h>
2323
24+#include <pthread.h>
25+#include <semaphore.h>
26+
2427 extern "C" {
28+#include "libavformat/avformat.h"
2529 #include "libavformat/internal.h"
2630 #include "libavutil/imgutils.h"
2731 }
libavdevice/decklink_enc.h+0−2
@@ -23,8 +23,6 @@ · 22 unmodified lines
2323 extern "C" {
2424 #endif
2525
26−#include "libavformat/avformat.h"
27−
2826 int ff_decklink_write_header(AVFormatContext *avctx);
2927 int ff_decklink_write_packet(AVFormatContext *avctx, AVPacket *pkt);
3028 int ff_decklink_write_trailer(AVFormatContext *avctx);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t