[FFmpeg-devel] [PATCH 3/8] avdevice/decklink: remove unused itermode iterators

[Deti Fliegl]

Patch accepted, please apply.

On 23/06/16 02:47, Marton Balint wrote:
> Signed-off-by: Marton Balint <cus at passwd.hu>
> ---
>  libavdevice/decklink_dec.cpp | 9 ---------
>  libavdevice/decklink_enc.cpp | 8 --------
>  2 files changed, 17 deletions(-)
>
> diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp
> index 8b57e0c..0d652bc 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 4d00a53..3f4b22c 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;
>
>