From 944203270dc37b9cbbc3ead9dfc3fba6bc009789 Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Wed, 21 Aug 2019 23:02:51 +0200 Subject: [PATCH] avdevice/decklink: deprecate the -list_devices option The user should use ffmpeg -sources decklink or ffmpeg -sinks decklink instead. Signed-off-by: Marton Balint --- doc/indevs.texi | 6 +++--- doc/outdevs.texi | 6 +++--- libavdevice/decklink_dec.cpp | 1 + libavdevice/decklink_enc.cpp | 1 + libavdevice/version.h | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/doc/indevs.texi b/doc/indevs.texi index 28d98a8a55..6f5afaf344 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -277,8 +277,8 @@ audio track. @item list_devices If set to @option{true}, print a list of devices and exit. -Defaults to @option{false}. Alternatively you can use the @code{-sources} -option of ffmpeg to list the available input devices. +Defaults to @option{false}. This option is deprecated, please use the +@code{-sources} option of ffmpeg to list the available input devices. @item list_formats If set to @option{true}, print a list of supported formats and exit. @@ -407,7 +407,7 @@ Defaults to @option{false}. @item List input devices: @example -ffmpeg -f decklink -list_devices 1 -i dummy +ffmpeg -sources decklink @end example @item diff --git a/doc/outdevs.texi b/doc/outdevs.texi index c96d2d0e43..27f543fa1a 100644 --- a/doc/outdevs.texi +++ b/doc/outdevs.texi @@ -140,8 +140,8 @@ device with @command{-list_formats 1}. Audio sample rate is always 48 kHz. @item list_devices If set to @option{true}, print a list of devices and exit. -Defaults to @option{false}. Alternatively you can use the @code{-sinks} -option of ffmpeg to list the available output devices. +Defaults to @option{false}. This option is deprecated, please use the +@code{-sinks} option of ffmpeg to list the available output devices. @item list_formats If set to @option{true}, print a list of supported formats and exit. @@ -168,7 +168,7 @@ Defaults to @samp{unset}. @item List output devices: @example -ffmpeg -i test.avi -f decklink -list_devices 1 dummy +ffmpeg -sinks decklink @end example @item diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 0360bd16fb..1fd5adf515 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -1050,6 +1050,7 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx) /* List available devices. */ if (ctx->list_devices) { + av_log(avctx, AV_LOG_WARNING, "The -list_devices option is deprecated and will be removed. Please use ffmpeg -sources decklink instead.\n"); ff_decklink_list_devices_legacy(avctx, 1, 0); return AVERROR_EXIT; } diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp index 04b06aee3a..883fdeadfb 100644 --- a/libavdevice/decklink_enc.cpp +++ b/libavdevice/decklink_enc.cpp @@ -568,6 +568,7 @@ av_cold int ff_decklink_write_header(AVFormatContext *avctx) /* List available devices and exit. */ if (ctx->list_devices) { + av_log(avctx, AV_LOG_WARNING, "The -list_devices option is deprecated and will be removed. Please use ffmpeg -sinks decklink instead.\n"); ff_decklink_list_devices_legacy(avctx, 0, 1); return AVERROR_EXIT; } diff --git a/libavdevice/version.h b/libavdevice/version.h index ec0ba776be..10717564e9 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -29,7 +29,7 @@ #define LIBAVDEVICE_VERSION_MAJOR 58 #define LIBAVDEVICE_VERSION_MINOR 9 -#define LIBAVDEVICE_VERSION_MICRO 102 +#define LIBAVDEVICE_VERSION_MICRO 103 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ LIBAVDEVICE_VERSION_MINOR, \