diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 19:04:58 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 19:04:58 +0400 |
| commit | 13afee951a49964abb6d3e2d11644ac9d5ded2c7 (patch) | |
| tree | ba98a70ac6f80dea08f21badfbbb64319541d826 /libavfilter/avfilter.c | |
| parent | af7dd79a323090b14a7fb9ef24a3f6a24dc6d2db (diff) | |
| parent | 59ee9f78b0cc4fb84ae606fa317d8102ad32a627 (diff) | |
Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'
* commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627':
lavfi: do not use av_pix_fmt_descriptors directly.
Conflicts:
libavfilter/buffersrc.c
libavfilter/drawutils.c
libavfilter/filtfmts.c
libavfilter/vf_ass.c
libavfilter/vf_boxblur.c
libavfilter/vf_drawtext.c
libavfilter/vf_lut.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_showinfo.c
libavfilter/vf_transpose.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.c')
| -rw-r--r-- | libavfilter/avfilter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 670a3a3dd0..dee7ba08de 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -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" : ""); |