diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-03 19:35:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-03 19:35:08 +0200 |
| commit | 85aaa4e6d571e44749f80b8223c07d656bf8e035 (patch) | |
| tree | 4ab335f77e8c50ebd7cd0f9924cef190e3356e2b | |
| parent | f1d6fc779450715fda20e7844ffc6364e50f5a3e (diff) | |
| parent | 072916d903d3a925bcd0c864f12254157cab63c1 (diff) | |
| download | ffmpeg-85aaa4e6d571e44749f80b8223c07d656bf8e035.tar.gz | |
Merge commit '072916d903d3a925bcd0c864f12254157cab63c1'
* commit '072916d903d3a925bcd0c864f12254157cab63c1':
filtfmts: Replace deprecated uses of AVFilterPad
Conflicts:
libavfilter/filtfmts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/filtfmts.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libavfilter/filtfmts.c b/libavfilter/filtfmts.c index dd757a5274..c1025b978e 100644 --- a/libavfilter/filtfmts.c +++ b/libavfilter/filtfmts.c @@ -21,8 +21,10 @@ #include <stdio.h> #include "libavutil/channel_layout.h" +#include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "libavutil/samplefmt.h" + #include "libavfilter/avfilter.h" #include "libavfilter/formats.h" @@ -38,7 +40,7 @@ static void print_formats(AVFilterContext *filter_ctx) for (j = 0; j < fmts->nb_formats; j++) \ if(av_get_pix_fmt_name(fmts->formats[j])) \ printf(#INOUT "PUT[%d] %s: fmt:%s\n", \ - i, filter_ctx->inout##put_pads[i].name, \ + i, avfilter_pad_get_name(filter_ctx->inout##put_pads, i), \ av_get_pix_fmt_name(fmts->formats[j])); \ } else if (filter_ctx->inout##puts[i]->type == AVMEDIA_TYPE_AUDIO) { \ AVFilterFormats *fmts; \ @@ -47,7 +49,7 @@ static void print_formats(AVFilterContext *filter_ctx) fmts = filter_ctx->inout##puts[i]->outin##_formats; \ for (j = 0; j < fmts->nb_formats; j++) \ printf(#INOUT "PUT[%d] %s: fmt:%s\n", \ - i, filter_ctx->inout##put_pads[i].name, \ + i, avfilter_pad_get_name(filter_ctx->inout##put_pads, i), \ av_get_sample_fmt_name(fmts->formats[j])); \ \ layouts = filter_ctx->inout##puts[i]->outin##_channel_layouts; \ @@ -56,7 +58,7 @@ static void print_formats(AVFilterContext *filter_ctx) av_get_channel_layout_string(buf, sizeof(buf), -1, \ layouts->channel_layouts[j]); \ printf(#INOUT "PUT[%d] %s: chlayout:%s\n", \ - i, filter_ctx->inout##put_pads[i].name, buf); \ + i, avfilter_pad_get_name(filter_ctx->inout##put_pads, i), buf); \ } \ } \ } \ @@ -113,12 +115,12 @@ int main(int argc, char **argv) /* create a link for each of the input pads */ for (i = 0; i < filter_ctx->nb_inputs; i++) { AVFilterLink *link = av_mallocz(sizeof(AVFilterLink)); - link->type = filter_ctx->input_pads[i].type; + link->type = avfilter_pad_get_type(filter_ctx->input_pads, i); filter_ctx->inputs[i] = link; } for (i = 0; i < filter_ctx->nb_outputs; i++) { AVFilterLink *link = av_mallocz(sizeof(AVFilterLink)); - link->type = filter_ctx->output_pads[i].type; + link->type = avfilter_pad_get_type(filter_ctx->output_pads, i); filter_ctx->outputs[i] = link; } |