Ticket #5183: 0001-decklink-Header-cleanup.patch

File 0001-decklink-Header-cleanup.patch, 3.8 KB (added by Timothy Gu, 10 years ago)

New patch

  • libavdevice/decklink_common.cpp 

    From 91ce4613671ef8f9351bbd0f600b0b790b81d2c6 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Tue, 1 Dec 2015 20:58:51 -0800
Subject: [PATCH] decklink: Header cleanup

This commit cleans up the decklink files' header usage so that they pass
checkheaders.
---
 libavdevice/decklink_common.cpp | 5 -----
 libavdevice/decklink_common.h   | 7 +++++++
 libavdevice/decklink_common_c.h | 2 ++
 libavdevice/decklink_dec.cpp    | 6 ------
 libavdevice/decklink_dec.h      | 2 ++
 libavdevice/decklink_enc.cpp    | 6 ------
 libavdevice/decklink_enc.h      | 2 ++
 7 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp
index ac7964c..7d851cd 100644
    a b  
    1919 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
    2020 */
    2121
    22 #include <DeckLinkAPI.h>
    2322#ifdef _WIN32
    2423#include <DeckLinkAPI_i.c>
    2524#else
    2625#include <DeckLinkAPIDispatch.cpp>
    2726#endif
    2827
    29 #include <pthread.h>
    30 #include <semaphore.h>
    31 
    3228extern "C" {
    33 #include "libavformat/avformat.h"
    3429#include "libavformat/internal.h"
    3530#include "libavutil/imgutils.h"
    3631}

  • libavdevice/decklink_common.h 

    diff --git a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h
index 3bc30f0..c3ff12b 100644
    a b  
    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>
    2225#include <DeckLinkAPIVersion.h>
    2326
     27extern "C" {
     28#include "libavformat/avformat.h"
     29
    2430#include "decklink_common_c.h"
     31}
    2532
    2633class decklink_output_callback;
    2734class decklink_input_callback;

  • libavdevice/decklink_common_c.h 

    diff --git a/libavdevice/decklink_common_c.h b/libavdevice/decklink_common_c.h
index fb2b788..3644fb4 100644
    a b  
    1919 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
    2020 */
    2121
     22#include "libavutil/log.h"
     23
    2224struct decklink_cctx {
    2325    const AVClass *cclass;
    2426

  • libavdevice/decklink_dec.cpp 

    diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp
index 6c5bc5d..0214b90 100644
    a b  
    1919 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
    2020 */
    2121
    22 #include <DeckLinkAPI.h>
    23 
    24 #include <pthread.h>
    25 #include <semaphore.h>
    26 
    2722extern "C" {
    28 #include "libavformat/avformat.h"
    2923#include "libavformat/internal.h"
    3024#include "libavutil/imgutils.h"
    3125}

  • libavdevice/decklink_dec.h 

    diff --git a/libavdevice/decklink_dec.h b/libavdevice/decklink_dec.h
index 6bd9226..c499bc9 100644
    a b  
    2323extern "C" {
    2424#endif
    2525
     26#include "libavformat/avformat.h"
     27
    2628int ff_decklink_read_header(AVFormatContext *avctx);
    2729int ff_decklink_read_packet(AVFormatContext *avctx, AVPacket *pkt);
    2830int ff_decklink_read_close(AVFormatContext *avctx);

  • libavdevice/decklink_enc.cpp 

    diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp
index 6c5450f..7a54f1e 100644
    a b  
    1919 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
    2020 */
    2121
    22 #include <DeckLinkAPI.h>
    23 
    24 #include <pthread.h>
    25 #include <semaphore.h>
    26 
    2722extern "C" {
    28 #include "libavformat/avformat.h"
    2923#include "libavformat/internal.h"
    3024#include "libavutil/imgutils.h"
    3125}

  • libavdevice/decklink_enc.h 

    diff --git a/libavdevice/decklink_enc.h b/libavdevice/decklink_enc.h
index 6086947..23c59a2 100644
    a b  
    2323extern "C" {
    2424#endif
    2525
     26#include "libavformat/avformat.h"
     27
    2628int ff_decklink_write_header(AVFormatContext *avctx);
    2729int ff_decklink_write_packet(AVFormatContext *avctx, AVPacket *pkt);
    2830int ff_decklink_write_trailer(AVFormatContext *avctx);