History

avdevice/decklink: remove unused itermode iterators

Marton Balint committed 10 years ago

Commit 4ce0a771 parent 1fc85d82 files · +0 −17Browse files

Unified · Split

2 files
  1. libavdevice/decklink_dec.cpp +0 −9
  2. libavdevice/decklink_enc.cpp +0 −8
libavdevice/decklink_dec.cpp+0−9
@@ -431,7 +431,6 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx) · 430 unmodified lines
431431 {
432432 struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data;
433433 struct decklink_ctx *ctx;
434− IDeckLinkDisplayModeIterator *itermode;
435434 IDeckLinkIterator *iter;
436435 IDeckLink *dl = NULL;
437436 AVStream *st;
@@ -520,12 +519,6 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx) · 82 unmodified lines
520519 return AVERROR_EXIT;
521520 }
522521
523− if (ctx->dli->GetDisplayModeIterator(&itermode) != S_OK) {
524− av_log(avctx, AV_LOG_ERROR, "Could not get Display Mode Iterator\n");
525− ctx->dl->Release();
526− return AVERROR(EIO);
527− }
528−
529522 if (mode_num > 0) {
530523 if (ff_decklink_set_format(avctx, DIRECTION_IN, mode_num) < 0) {
531524 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) · 1 unmodified line
533526 }
534527 }
535528
536− itermode->Release();
537−
538529 /* Setup streams. */
539530 st = avformat_new_stream(avctx, NULL);
540531 if (!st) {
libavdevice/decklink_enc.cpp+0−8
@@ -312,7 +312,6 @@ av_cold int ff_decklink_write_header(AVFormatContext *avctx) · 311 unmodified lines
312312 {
313313 struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data;
314314 struct decklink_ctx *ctx;
315− IDeckLinkDisplayModeIterator *itermode;
316315 IDeckLinkIterator *iter;
317316 IDeckLink *dl = NULL;
318317 unsigned int n;
@@ -371,12 +370,6 @@ av_cold int ff_decklink_write_header(AVFormatContext *avctx) · 52 unmodified lines
371370 return AVERROR_EXIT;
372371 }
373372
374− if (ctx->dlo->GetDisplayModeIterator(&itermode) != S_OK) {
375− av_log(avctx, AV_LOG_ERROR, "Could not get Display Mode Iterator\n");
376− ctx->dl->Release();
377− return AVERROR(EIO);
378− }
379−
380373 /* Setup streams. */
381374 for (n = 0; n < avctx->nb_streams; n++) {
382375 AVStream *st = avctx->streams[n];
@@ -392,7 +385,6 @@ av_cold int ff_decklink_write_header(AVFormatContext *avctx) · 9 unmodified lines
392385 goto error;
393386 }
394387 }
395− itermode->Release();
396388
397389 return 0;
398390

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t