ffmpeg | branch: master | Timothy Gu <timothyg...@gmail.com> | Sun Jan 24 12:42:39 2016 -0800| [ce36cb08ed46ae03cb2286b3f8d107e3eaa6a625] | committer: Timothy Gu
Revert "decklink: Header cleanup" This reverts commit 61fb70c3866b19dccf473ad4e5ede79d117e8e1c. Reported in #5183 to break the build. Further investigation needed. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ce36cb08ed46ae03cb2286b3f8d107e3eaa6a625 --- libavdevice/decklink_common.cpp | 4 ++++ libavdevice/decklink_common.h | 8 +------- libavdevice/decklink_common_c.h | 2 -- libavdevice/decklink_dec.cpp | 4 ++++ libavdevice/decklink_dec.h | 2 -- libavdevice/decklink_enc.cpp | 4 ++++ libavdevice/decklink_enc.h | 2 -- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp index 58502ee..ac7964c 100644 --- a/libavdevice/decklink_common.cpp +++ b/libavdevice/decklink_common.cpp @@ -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" } diff --git a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h index c7e3ef2..3bc30f0 100644 --- a/libavdevice/decklink_common.h +++ b/libavdevice/decklink_common.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; diff --git a/libavdevice/decklink_common_c.h b/libavdevice/decklink_common_c.h index 3644fb4..fb2b788 100644 --- a/libavdevice/decklink_common_c.h +++ b/libavdevice/decklink_common_c.h @@ -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; diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 4bbc92e..6c5bc5d 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -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" } diff --git a/libavdevice/decklink_dec.h b/libavdevice/decklink_dec.h index c499bc9..6bd9226 100644 --- a/libavdevice/decklink_dec.h +++ b/libavdevice/decklink_dec.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); diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp index 334c3dc..6c5450f 100644 --- a/libavdevice/decklink_enc.cpp +++ b/libavdevice/decklink_enc.cpp @@ -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" } diff --git a/libavdevice/decklink_enc.h b/libavdevice/decklink_enc.h index 23c59a2..6086947 100644 --- a/libavdevice/decklink_enc.h +++ b/libavdevice/decklink_enc.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); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
