X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Favfilter.c;h=dee7ba08de5c2d9a4d1fc893bd6ac882def68c0b;hb=6912e7a008acd1464a63b0a00779a3de81b9a8ab;hp=9f49a8b2b101bf4070cb5d4d6a7f0b5c77824c48;hpb=ae0449314ca61e84c64568546922e91f5d81d500;p=ffmpeg diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 9f49a8b2b10..dee7ba08de5 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -142,7 +142,7 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad, link->srcpad = &src->output_pads[srcpad]; link->dstpad = &dst->input_pads[dstpad]; link->type = src->output_pads[srcpad].type; - av_assert0(PIX_FMT_NONE == -1 && AV_SAMPLE_FMT_NONE == -1); + av_assert0(AV_PIX_FMT_NONE == -1 && AV_SAMPLE_FMT_NONE == -1); link->format = -1; return 0; @@ -311,7 +311,7 @@ void ff_tlog_link(void *ctx, AVFilterLink *link, int end) ff_tlog(ctx, "link[%p s:%dx%d fmt:%s %s->%s]%s", link, link->w, link->h, - av_pix_fmt_descriptors[link->format].name, + av_get_pix_fmt_name(link->format), link->src ? link->src->filter->name : "", link->dst ? link->dst->filter->name : "", end ? "\n" : "");