opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-24 08:41:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

avdevice/decklink_dec: remove the @mode syntax

Browse Source 
Deprecated since March 28, 2017.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2019-08-21 22:40:11 +02:00
parent d111a41f9d
commit 78a233e6e9
3 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavdevice/decklink_common.cpp
View File

@ -200,7 +200,7 @@ int ff_decklink_set_format(AVFormatContext *avctx,
int width, int height,
int tb_num, int tb_den,
enum AVFieldOrder field_order,
decklink_direction_t direction, int num)
decklink_direction_t direction)
{
struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data;
struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx;
@ -214,8 +214,8 @@ int ff_decklink_set_format(AVFormatContext *avctx,
int i = 1;
HRESULT res;
av_log(avctx, AV_LOG_DEBUG, "Trying to find mode for frame size %dx%d, frame timing %d/%d, field order %d, direction %d, mode number %d, format code %s\n",
width, height, tb_num, tb_den, field_order, direction, num, (cctx->format_code) ? cctx->format_code : "(unset)");
av_log(avctx, AV_LOG_DEBUG, "Trying to find mode for frame size %dx%d, frame timing %d/%d, field order %d, direction %d, format code %s\n",
width, height, tb_num, tb_den, field_order, direction, cctx->format_code ? cctx->format_code : "(unset)");
if (direction == DIRECTION_IN) {
res = ctx->dli->GetDisplayModeIterator (&itermode);
@ -248,7 +248,6 @@ int ff_decklink_set_format(AVFormatContext *avctx,
bmd_height == height &&
!av_cmp_q(mode_tb, target_tb) &&
field_order_eq(field_order, bmd_field_dominance))
|| i == num
|| target_mode == bmd_mode) {
ctx->bmd_mode = bmd_mode;
ctx->bmd_width = bmd_width;
@ -314,8 +313,8 @@ int ff_decklink_set_format(AVFormatContext *avctx,
return -1;
}
int ff_decklink_set_format(AVFormatContext *avctx, decklink_direction_t direction, int num) {
return ff_decklink_set_format(avctx, 0, 0, 0, 0, AV_FIELD_UNKNOWN, direction, num);
int ff_decklink_set_format(AVFormatContext *avctx, decklink_direction_t direction) {
return ff_decklink_set_format(avctx, 0, 0, 0, 0, AV_FIELD_UNKNOWN, direction);
}
int ff_decklink_list_devices(AVFormatContext *avctx,