diff mbox series

[FFmpeg-devel,1/4] avdevice/decklink_commoh.h: remove unsupported decklink version ifdef

Message ID 20200908175232.5733-1-cus@passwd.hu
State Accepted
Commit a9ede0bde4c973296a2e82f11d1458ad3930d4c7
Headers show
Series [FFmpeg-devel,1/4] avdevice/decklink_commoh.h: remove unsupported decklink version ifdef | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Marton Balint Sept. 8, 2020, 5:52 p.m. UTC 
Signed-off-by: Marton Balint <cus@passwd.hu>
---
 libavdevice/decklink_common.h | 4 ----
 1 file changed, 4 deletions(-)

Comments

Moritz Barsnick Sept. 11, 2020, 9:32 a.m. UTC | #1 
On Tue, Sep 08, 2020 at 19:52:29 +0200, Marton Balint wrote:
> Subject: Re: [FFmpeg-devel] [PATCH 1/4] avdevice/decklink_commoh.h: remove
Nit: typo                                                        ^

Moritz
Marton Balint Sept. 13, 2020, 4:51 p.m. UTC | #2 
On Fri, 11 Sep 2020, Moritz Barsnick wrote:

> On Tue, Sep 08, 2020 at 19:52:29 +0200, Marton Balint wrote:
>> Subject: Re: [FFmpeg-devel] [PATCH 1/4] avdevice/decklink_commoh.h: remove
> Nit: typo                                                        ^

Thanks, applied the series with that changed.

Regards,
Marton
diff mbox series

Patch

diff --git a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h
index bd68c7ba77..9f69054e64 100644
--- a/libavdevice/decklink_common.h
+++ b/libavdevice/decklink_common.h
@@ -156,11 +156,7 @@  struct decklink_ctx {
 typedef enum { DIRECTION_IN, DIRECTION_OUT} decklink_direction_t;
 
 #ifdef _WIN32
-#if BLACKMAGIC_DECKLINK_API_VERSION < 0x0a040000
-typedef unsigned long buffercount_type;
-#else
 typedef unsigned int buffercount_type;
-#endif
 IDeckLinkIterator *CreateDeckLinkIteratorInstance(void);
 #else
 typedef uint32_t buffercount_type;