diff options
| author | Marton Balint <cus@passwd.hu> | 2016-06-18 16:04:30 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2016-06-26 19:17:40 +0200 |
| commit | 4ce0a77ec80f71a9726e85d66063248bf4165bfb (patch) | |
| tree | e663c9a8d5338e3bfbc8bbcaf2b077af9af711ec /libavdevice | |
| parent | 1fc85d8511fb059450e36f2493b273635d507aa3 (diff) | |
| download | ffmpeg-4ce0a77ec80f71a9726e85d66063248bf4165bfb.tar.gz | |
avdevice/decklink: remove unused itermode iterators
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/decklink_dec.cpp | 9 | ||||
| -rw-r--r-- | libavdevice/decklink_enc.cpp | 8 |
2 files changed, 0 insertions, 17 deletions
diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 8b57e0cd08..0d652bc8db 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -431,7 +431,6 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx) { struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; struct decklink_ctx *ctx; - IDeckLinkDisplayModeIterator *itermode; IDeckLinkIterator *iter; IDeckLink *dl = NULL; AVStream *st; @@ -520,12 +519,6 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx) return AVERROR_EXIT; } - if (ctx->dli->GetDisplayModeIterator(&itermode) != S_OK) { - av_log(avctx, AV_LOG_ERROR, "Could not get Display Mode Iterator\n"); - ctx->dl->Release(); - return AVERROR(EIO); - } - if (mode_num > 0) { if (ff_decklink_set_format(avctx, DIRECTION_IN, mode_num) < 0) { av_log(avctx, AV_LOG_ERROR, "Could not set mode %d for %s\n", mode_num, fname); @@ -533,8 +526,6 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx) } } - itermode->Release(); - /* Setup streams. */ st = avformat_new_stream(avctx, NULL); if (!st) { diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp index 4d00a537ec..3f4b22cdbf 100644 --- a/libavdevice/decklink_enc.cpp +++ b/libavdevice/decklink_enc.cpp @@ -312,7 +312,6 @@ av_cold int ff_decklink_write_header(AVFormatContext *avctx) { struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; struct decklink_ctx *ctx; - IDeckLinkDisplayModeIterator *itermode; IDeckLinkIterator *iter; IDeckLink *dl = NULL; unsigned int n; @@ -371,12 +370,6 @@ av_cold int ff_decklink_write_header(AVFormatContext *avctx) return AVERROR_EXIT; } - if (ctx->dlo->GetDisplayModeIterator(&itermode) != S_OK) { - av_log(avctx, AV_LOG_ERROR, "Could not get Display Mode Iterator\n"); - ctx->dl->Release(); - return AVERROR(EIO); - } - /* Setup streams. */ for (n = 0; n < avctx->nb_streams; n++) { AVStream *st = avctx->streams[n]; @@ -392,7 +385,6 @@ av_cold int ff_decklink_write_header(AVFormatContext *avctx) goto error; } } - itermode->Release(); return 0; |