History

avdevice/decklink: deprecate @mode syntax in device name to specify mode

Marton Balint committed 9 years ago

Commit 77d2cb81 parent c395d232 files · +4 −4Browse files

Showing the changes to libavdevice/decklink_common.cpp (1 of 2 files). Show all

Unified · Split

libavdevice/decklink_common.cpp+3−4
@@ -286,7 +286,6 @@ int ff_decklink_list_formats(AVFormatContext *avctx, decklink_direction_t direct · 285 unmodified lines
286 IDeckLinkDisplayModeIterator *itermode;286 IDeckLinkDisplayModeIterator *itermode;
287 IDeckLinkDisplayMode *mode;287 IDeckLinkDisplayMode *mode;
288 uint32_t format_code;288 uint32_t format_code;
289 int i=0;
290 HRESULT res;289 HRESULT res;
291 290
292 if (direction == DIRECTION_IN) {291 if (direction == DIRECTION_IN) {
@@ -307,14 +306,14 @@ int ff_decklink_list_formats(AVFormatContext *avctx, decklink_direction_t direct · 14 unmodified lines
307 return AVERROR(EIO);306 return AVERROR(EIO);
308 }307 }
309 308
310 av_log(avctx, AV_LOG_INFO, "Supported formats for '%s':\n\tmode\tformat_code\tdescription",309 av_log(avctx, AV_LOG_INFO, "Supported formats for '%s':\n\tformat_code\tdescription",
311 avctx->filename);310 avctx->filename);
312 while (itermode->Next(&mode) == S_OK) {311 while (itermode->Next(&mode) == S_OK) {
313 BMDTimeValue tb_num, tb_den;312 BMDTimeValue tb_num, tb_den;
314 mode->GetFrameRate(&tb_num, &tb_den);313 mode->GetFrameRate(&tb_num, &tb_den);
315 format_code = av_bswap32(mode->GetDisplayMode());314 format_code = av_bswap32(mode->GetDisplayMode());
316 av_log(avctx, AV_LOG_INFO, "\n\t%d\t%.4s\t\t%ldx%ld at %d/%d fps",315 av_log(avctx, AV_LOG_INFO, "\n\t%.4s\t\t%ldx%ld at %d/%d fps",
317 ++i, (char*) &format_code, mode->GetWidth(), mode->GetHeight(),316 (char*) &format_code, mode->GetWidth(), mode->GetHeight(),
318 (int) tb_den, (int) tb_num);317 (int) tb_den, (int) tb_num);
319 switch (mode->GetFieldDominance()) {318 switch (mode->GetFieldDominance()) {
320 case bmdLowerFieldFirst:319 case bmdLowerFieldFirst:

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