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
431{431{
432 struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data;432 struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data;
433 struct decklink_ctx *ctx;433 struct decklink_ctx *ctx;
434 IDeckLinkDisplayModeIterator *itermode;
435 IDeckLinkIterator *iter;434 IDeckLinkIterator *iter;
436 IDeckLink *dl = NULL;435 IDeckLink *dl = NULL;
437 AVStream *st;436 AVStream *st;
@@ -520,12 +519,6 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx) · 82 unmodified lines
520 return AVERROR_EXIT;519 return AVERROR_EXIT;
521 }520 }
522 521
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
529 if (mode_num > 0) {522 if (mode_num > 0) {
530 if (ff_decklink_set_format(avctx, DIRECTION_IN, mode_num) < 0) {523 if (ff_decklink_set_format(avctx, DIRECTION_IN, mode_num) < 0) {
531 av_log(avctx, AV_LOG_ERROR, "Could not set mode %d for %s\n", mode_num, fname);524 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
533 }526 }
534 }527 }
535 528
536 itermode->Release();
537
538 /* Setup streams. */529 /* Setup streams. */
539 st = avformat_new_stream(avctx, NULL);530 st = avformat_new_stream(avctx, NULL);
540 if (!st) {531 if (!st) {
libavdevice/decklink_enc.cpp+0−8
@@ -312,7 +312,6 @@ av_cold int ff_decklink_write_header(AVFormatContext *avctx) · 311 unmodified lines
312{312{
313 struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data;313 struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data;
314 struct decklink_ctx *ctx;314 struct decklink_ctx *ctx;
315 IDeckLinkDisplayModeIterator *itermode;
316 IDeckLinkIterator *iter;315 IDeckLinkIterator *iter;
317 IDeckLink *dl = NULL;316 IDeckLink *dl = NULL;
318 unsigned int n;317 unsigned int n;
@@ -371,12 +370,6 @@ av_cold int ff_decklink_write_header(AVFormatContext *avctx) · 52 unmodified lines
371 return AVERROR_EXIT;370 return AVERROR_EXIT;
372 }371 }
373 372
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
380 /* Setup streams. */373 /* Setup streams. */
381 for (n = 0; n < avctx->nb_streams; n++) {374 for (n = 0; n < avctx->nb_streams; n++) {
382 AVStream *st = avctx->streams[n];375 AVStream *st = avctx->streams[n];
@@ -392,7 +385,6 @@ av_cold int ff_decklink_write_header(AVFormatContext *avctx) · 9 unmodified lines
392 goto error;385 goto error;
393 }386 }
394 }387 }
395 itermode->Release();
396 388
397 return 0;389 return 0;
398 390

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