highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '072916d903d3a925bcd0c864f12254157cab63c1'

Browse Source 
* commit '072916d903d3a925bcd0c864f12254157cab63c1':
  filtfmts: Replace deprecated uses of AVFilterPad

Conflicts:
	libavfilter/filtfmts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-03 19:35:08 +02:00
commit 85aaa4e6d5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavfilter/filtfmts.c
View File

@ -21,8 +21,10 @@
#include <stdio.h> #include <stdio.h>
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "libavutil/mem.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavutil/samplefmt.h" #include "libavutil/samplefmt.h"
#include "libavfilter/avfilter.h" #include "libavfilter/avfilter.h"
#include "libavfilter/formats.h" #include "libavfilter/formats.h"
@ -38,7 +40,7 @@ static void print_formats(AVFilterContext *filter_ctx)
for (j = 0; j < fmts->nb_formats; j++) \ for (j = 0; j < fmts->nb_formats; j++) \
if(av_get_pix_fmt_name(fmts->formats[j])) \ if(av_get_pix_fmt_name(fmts->formats[j])) \
printf(#INOUT "PUT[%d] %s: fmt:%s\n", \ 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])); \ av_get_pix_fmt_name(fmts->formats[j])); \
} else if (filter_ctx->inout##puts[i]->type == AVMEDIA_TYPE_AUDIO) { \ } else if (filter_ctx->inout##puts[i]->type == AVMEDIA_TYPE_AUDIO) { \
AVFilterFormats *fmts; \ AVFilterFormats *fmts; \
@ -47,7 +49,7 @@ static void print_formats(AVFilterContext *filter_ctx)
fmts = filter_ctx->inout##puts[i]->outin##_formats; \ fmts = filter_ctx->inout##puts[i]->outin##_formats; \
for (j = 0; j < fmts->nb_formats; j++) \ for (j = 0; j < fmts->nb_formats; j++) \
printf(#INOUT "PUT[%d] %s: fmt:%s\n", \ 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])); \ av_get_sample_fmt_name(fmts->formats[j])); \
\ \
layouts = filter_ctx->inout##puts[i]->outin##_channel_layouts; \ 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, \ av_get_channel_layout_string(buf, sizeof(buf), -1, \
layouts->channel_layouts[j]); \ layouts->channel_layouts[j]); \
printf(#INOUT "PUT[%d] %s: chlayout:%s\n", \ 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 */ /* create a link for each of the input pads */
for (i = 0; i < filter_ctx->nb_inputs; i++) { for (i = 0; i < filter_ctx->nb_inputs; i++) {
AVFilterLink *link = av_mallocz(sizeof(AVFilterLink)); 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; filter_ctx->inputs[i] = link;
} }
for (i = 0; i < filter_ctx->nb_outputs; i++) { for (i = 0; i < filter_ctx->nb_outputs; i++) {
AVFilterLink *link = av_mallocz(sizeof(AVFilterLink)); 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; filter_ctx->outputs[i] = link;
} }