From: Stefano Sabatini Date: Fri, 20 Aug 2010 14:41:21 +0000 (+0000) Subject: Make ff_dprintf_picref() print video properties only if available. X-Git-Tag: v0.7b2~2847 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=382ecd353768437d0e3f1e9e52eabcfe48b2c08b;p=coroid%2Flibav_saccubus.git Make ff_dprintf_picref() print video properties only if available. Originally committed as revision 24844 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 0c5c74178..580023ce8 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -194,13 +194,18 @@ int avfilter_config_links(AVFilterContext *filter) void ff_dprintf_picref(void *ctx, AVFilterBufferRef *picref, int end) { dprintf(ctx, - "picref[%p data:%p linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64" a:%d/%d s:%dx%d]%s", + "picref[%p data:%p linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64, picref, picref->data[0], picref->linesize[0], picref->linesize[1], picref->linesize[2], picref->linesize[3], - picref->pts, picref->pos, - picref->video->pixel_aspect.num, picref->video->pixel_aspect.den, picref->video->w, picref->video->h, - end ? "\n" : ""); + picref->pts, picref->pos); + + if (picref->video) { + dprintf(ctx, " a:%d/%d s:%dx%d", + picref->video->pixel_aspect.num, picref->video->pixel_aspect.den, + picref->video->w, picref->video->h); + } + dprintf(ctx, "]%s", end ? "\n" : ""); } void ff_dprintf_link(void *ctx, AVFilterLink *link, int end)