[FFmpeg-cvslog] avdevice/decklink_dec: set configs before listing formats

Marton Balint git at videolan.org
Tue Apr 16 00:21:15 EEST 2019


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Thu Mar 14 02:00:27 2019 +0100| [e036b8dcf46dabe00f1cb535d185db0c681942e7] | committer: Marton Balint

avdevice/decklink_dec: set configs before listing formats

Format list can be input and profile dependant.

Signed-off-by: Marton Balint <cus at passwd.hu>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e036b8dcf46dabe00f1cb535d185db0c681942e7
---

 libavdevice/decklink_dec.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp
index 9de8fa0c9d..4da9122bff 100644
--- a/libavdevice/decklink_dec.cpp
+++ b/libavdevice/decklink_dec.cpp
@@ -1072,6 +1072,12 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx)
         goto error;
     }
 
+    if (ff_decklink_set_configs(avctx, DIRECTION_IN) < 0) {
+        av_log(avctx, AV_LOG_ERROR, "Could not set input configuration\n");
+        ret = AVERROR(EIO);
+        goto error;
+    }
+
     /* List supported formats. */
     if (ctx->list_formats) {
         ff_decklink_list_formats(avctx, DIRECTION_IN);
@@ -1079,12 +1085,6 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx)
         goto error;
     }
 
-    if (ff_decklink_set_configs(avctx, DIRECTION_IN) < 0) {
-        av_log(avctx, AV_LOG_ERROR, "Could not set input configuration\n");
-        ret = AVERROR(EIO);
-        goto error;
-    }
-
     input_callback = new decklink_input_callback(avctx);
     ret = (ctx->dli->SetCallback(input_callback) == S_OK ? 0 : AVERROR_EXTERNAL);
     input_callback->Release();



More information about the ffmpeg-cvslog mailing list