From 77d2cb88741a9ac6ab6a3c53b32b01cec07b99b2 Mon Sep 17 00:00:00 2001
From: Marton Balint <cus@passwd.hu>
Date: Sat, 25 Mar 2017 17:52:11 +0100
Subject: [PATCH] avdevice/decklink: deprecate @mode syntax in device name to
specify mode
Signed-off-by: Marton Balint <cus@passwd.hu>
---
libavdevice/decklink_common.cpp | 7 +++----
libavdevice/decklink_dec.cpp | 1 +
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp
index f17c263c4bf..c9107c036a5 100644
--- a/libavdevice/decklink_common.cpp
+++ b/libavdevice/decklink_common.cpp
@@ -286,7 +286,6 @@ int ff_decklink_list_formats(AVFormatContext *avctx, decklink_direction_t direct
IDeckLinkDisplayModeIterator *itermode;
IDeckLinkDisplayMode *mode;
uint32_t format_code;
- int i=0;
HRESULT res;
if (direction == DIRECTION_IN) {
@@ -307,14 +306,14 @@ int ff_decklink_list_formats(AVFormatContext *avctx, decklink_direction_t direct
return AVERROR(EIO);
}
- av_log(avctx, AV_LOG_INFO, "Supported formats for '%s':\n\tmode\tformat_code\tdescription",
+ av_log(avctx, AV_LOG_INFO, "Supported formats for '%s':\n\tformat_code\tdescription",
avctx->filename);
while (itermode->Next(&mode) == S_OK) {
BMDTimeValue tb_num, tb_den;
mode->GetFrameRate(&tb_num, &tb_den);
format_code = av_bswap32(mode->GetDisplayMode());
- av_log(avctx, AV_LOG_INFO, "\n\t%d\t%.4s\t\t%ldx%ld at %d/%d fps",
- ++i, (char*) &format_code, mode->GetWidth(), mode->GetHeight(),
+ av_log(avctx, AV_LOG_INFO, "\n\t%.4s\t\t%ldx%ld at %d/%d fps",
+ (char*) &format_code, mode->GetWidth(), mode->GetHeight(),
(int) tb_den, (int) tb_num);
switch (mode->GetFieldDominance()) {
case bmdLowerFieldFirst:
diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp
index ffe65db0d07..8cc1bdf7c9d 100644
--- a/libavdevice/decklink_dec.cpp
+++ b/libavdevice/decklink_dec.cpp
@@ -516,6 +516,7 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx)
strcpy (fname, avctx->filename);
tmp=strchr (fname, '@');
if (tmp != NULL) {
+ av_log(avctx, AV_LOG_WARNING, "The @mode syntax is deprecated and will be removed. Please use the -format_code option.\n");
mode_num = atoi (tmp+1);
*tmp = 0;
}
--
GitLab