virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

use avfilter_pad_get_{type,name} accessor functions

Browse Source 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Andreas Cadhalpun
2015-08-08 10:41:31 +02:00
parent 8bd74aafe8
commit 9126ae4b6b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmdutils.c
View File

@@ -1573,10 +1573,10 @@ int show_filters(void *optctx, const char *opt, const char *arg)
*(descr_cur++) = '>'; *(descr_cur++) = '>';
} }
pad = i ? filter->outputs : filter->inputs; pad = i ? filter->outputs : filter->inputs;
for (j = 0; pad && pad[j].name; j++) { for (j = 0; pad && avfilter_pad_get_name(pad, j); j++) {
if (descr_cur >= descr + sizeof(descr) - 4) if (descr_cur >= descr + sizeof(descr) - 4)
break; break;
*(descr_cur++) = get_media_type_char(pad[j].type); *(descr_cur++) = get_media_type_char(avfilter_pad_get_type(pad, j));
} }
if (!j) if (!j)
*(descr_cur++) = ((!i && (filter->flags & AVFILTER_FLAG_DYNAMIC_INPUTS)) || *(descr_cur++) = ((!i && (filter->flags & AVFILTER_FLAG_DYNAMIC_INPUTS)) ||

2
libavdevice/lavfi.c
View File

@@ -247,7 +247,7 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx)
for (i = 0, inout = output_links; inout; i++, inout = inout->next) { for (i = 0, inout = output_links; inout; i++, inout = inout->next) {
AVFilterContext *sink; AVFilterContext *sink;
type = inout->filter_ctx->output_pads[inout->pad_idx].type; type = avfilter_pad_get_type(inout->filter_ctx->output_pads, inout->pad_idx);
if (type == AVMEDIA_TYPE_VIDEO && ! buffersink || if (type == AVMEDIA_TYPE_VIDEO && ! buffersink ||
type == AVMEDIA_TYPE_AUDIO && ! abuffersink) { type == AVMEDIA_TYPE_AUDIO && ! abuffersink) {