diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 17:04:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 17:04:58 +0200 |
| commit | 13afee951a49964abb6d3e2d11644ac9d5ded2c7 (patch) | |
| tree | ba98a70ac6f80dea08f21badfbbb64319541d826 /libavfilter/vf_showinfo.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/vf_showinfo.c')
| -rw-r--r-- | libavfilter/vf_showinfo.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index c476f18ac5..297e8f195f 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -47,8 +47,9 @@ static int end_frame(AVFilterLink *inlink) AVFilterContext *ctx = inlink->dst; ShowInfoContext *showinfo = ctx->priv; AVFilterBufferRef *picref = inlink->cur_buf; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); uint32_t plane_checksum[4] = {0}, checksum = 0; - int i, plane, vsub = av_pix_fmt_descriptors[inlink->format].log2_chroma_h; + int i, plane, vsub = desc->log2_chroma_h; for (plane = 0; picref->data[plane] && plane < 4; plane++) { size_t linesize = av_image_get_linesize(picref->format, picref->video->w, plane); @@ -68,7 +69,7 @@ static int end_frame(AVFilterLink *inlink) "checksum:%08X plane_checksum:[%08X", showinfo->frame, av_ts2str(picref->pts), av_ts2timestr(picref->pts, &inlink->time_base), picref->pos, - av_pix_fmt_descriptors[picref->format].name, + desc->name, picref->video->sample_aspect_ratio.num, picref->video->sample_aspect_ratio.den, picref->video->w, picref->video->h, !picref->video->interlaced ? 'P' : /* Progressive */ |