diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-08-08 10:41:31 +0200 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-08-08 21:59:02 +0200 |
| commit | 9126ae4b6ba366f8e948a294b1955bcaf858eb16 (patch) | |
| tree | f4c735382d68dbbcf4ac86a156d3e1c9599d775c | |
| parent | 8bd74aafe85c426c8d9ac0aefa7ae860cf3be735 (diff) | |
| download | ffmpeg-9126ae4b6ba366f8e948a294b1955bcaf858eb16.tar.gz | |
use avfilter_pad_get_{type,name} accessor functions
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
| -rw-r--r-- | cmdutils.c | 4 | ||||
| -rw-r--r-- | libavdevice/lavfi.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmdutils.c b/cmdutils.c index 5aa56f15d0..78b0094dc0 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -1573,10 +1573,10 @@ int show_filters(void *optctx, const char *opt, const char *arg) *(descr_cur++) = '>'; } 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) break; - *(descr_cur++) = get_media_type_char(pad[j].type); + *(descr_cur++) = get_media_type_char(avfilter_pad_get_type(pad, j)); } if (!j) *(descr_cur++) = ((!i && (filter->flags & AVFILTER_FLAG_DYNAMIC_INPUTS)) || diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 126e5f62ce..0160f9fac8 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -247,7 +247,7 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) for (i = 0, inout = output_links; inout; i++, inout = inout->next) { 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 || type == AVMEDIA_TYPE_AUDIO && ! abuffersink) { |