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
26#include <DeckLinkAPIDispatch.cpp>26#include <DeckLinkAPIDispatch.cpp>
27#endif27#endif
28 28
29#include <pthread.h>
30#include <semaphore.h>
31
29extern "C" {32extern "C" {
33#include "libavformat/avformat.h"
30#include "libavformat/internal.h"34#include "libavformat/internal.h"
31#include "libavutil/imgutils.h"35#include "libavutil/imgutils.h"
32}36}
libavdevice/decklink_common.h+1−7
@@ -19,15 +19,9 @@ · 18 unmodified lines
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 */20 */
21 21
22#include <pthread.h>22#include <DeckLinkAPIVersion.h>
23#include <semaphore.h>
24#include <DeckLinkAPI.h>
25
26extern "C" {
27#include "libavformat/avformat.h"
28 23
29#include "decklink_common_c.h"24#include "decklink_common_c.h"
30}
31 25
32class decklink_output_callback;26class decklink_output_callback;
33class decklink_input_callback;27class decklink_input_callback;
libavdevice/decklink_common_c.h+0−2
@@ -19,8 +19,6 @@ · 18 unmodified lines
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 */20 */
21 21
22#include "libavutil/log.h"
23
24struct decklink_cctx {22struct decklink_cctx {
25 const AVClass *cclass;23 const AVClass *cclass;
26 24
libavdevice/decklink_dec.cpp+4−0
@@ -21,7 +21,11 @@ · 20 unmodified lines
21 21
22#include <DeckLinkAPI.h>22#include <DeckLinkAPI.h>
23 23
24#include <pthread.h>
25#include <semaphore.h>
26
24extern "C" {27extern "C" {
28#include "libavformat/avformat.h"
25#include "libavformat/internal.h"29#include "libavformat/internal.h"
26#include "libavutil/imgutils.h"30#include "libavutil/imgutils.h"
27}31}
libavdevice/decklink_dec.h+0−2
@@ -23,8 +23,6 @@ · 22 unmodified lines
23extern "C" {23extern "C" {
24#endif24#endif
25 25
26#include "libavformat/avformat.h"
27
28int ff_decklink_read_header(AVFormatContext *avctx);26int ff_decklink_read_header(AVFormatContext *avctx);
29int ff_decklink_read_packet(AVFormatContext *avctx, AVPacket *pkt);27int ff_decklink_read_packet(AVFormatContext *avctx, AVPacket *pkt);
30int ff_decklink_read_close(AVFormatContext *avctx);28int ff_decklink_read_close(AVFormatContext *avctx);
libavdevice/decklink_enc.cpp+4−0
@@ -21,7 +21,11 @@ · 20 unmodified lines
21 21
22#include <DeckLinkAPI.h>22#include <DeckLinkAPI.h>
23 23
24#include <pthread.h>
25#include <semaphore.h>
26
24extern "C" {27extern "C" {
28#include "libavformat/avformat.h"
25#include "libavformat/internal.h"29#include "libavformat/internal.h"
26#include "libavutil/imgutils.h"30#include "libavutil/imgutils.h"
27}31}
libavdevice/decklink_enc.h+0−2
@@ -23,8 +23,6 @@ · 22 unmodified lines
23extern "C" {23extern "C" {
24#endif24#endif
25 25
26#include "libavformat/avformat.h"
27
28int ff_decklink_write_header(AVFormatContext *avctx);26int ff_decklink_write_header(AVFormatContext *avctx);
29int ff_decklink_write_packet(AVFormatContext *avctx, AVPacket *pkt);27int ff_decklink_write_packet(AVFormatContext *avctx, AVPacket *pkt);
30int ff_decklink_write_trailer(AVFormatContext *avctx);28int 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