Merge commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 17:21:10 +0000 (18:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 17:21:10 +0000 (18:21 +0100)
* commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da':
  avfilter: more correct printf format specifiers

Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/vf_showinfo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/af_ashowinfo.c
libavfilter/vf_showinfo.c

@@@ -81,21 -91,20 +81,21 @@@ static int filter_frame(AVFilterLink *i
                                   buf->channel_layout);
  
      av_log(ctx, AV_LOG_INFO,
 -           "n:%"PRIu64" pts:%"PRId64" pts_time:%f "
 -           "fmt:%s chlayout:%s rate:%d nb_samples:%d "
 +           "n:%"PRId64" pts:%s pts_time:%s pos:%"PRId64" "
 +           "fmt:%s channels:%d chlayout:%s rate:%d nb_samples:%d "
-            "checksum:%08X ",
+            "checksum:%08"PRIX32" ",
 -           s->frame, buf->pts, buf->pts * av_q2d(inlink->time_base),
 -           av_get_sample_fmt_name(buf->format), chlayout_str,
 +           inlink->frame_count,
 +           av_ts2str(buf->pts), av_ts2timestr(buf->pts, &inlink->time_base),
 +           av_frame_get_pkt_pos(buf),
 +           av_get_sample_fmt_name(buf->format), av_frame_get_channels(buf), chlayout_str,
             buf->sample_rate, buf->nb_samples,
             checksum);
  
      av_log(ctx, AV_LOG_INFO, "plane_checksums: [ ");
      for (i = 0; i < planes; i++)
-         av_log(ctx, AV_LOG_INFO, "%08X ", s->plane_checksums[i]);
+         av_log(ctx, AV_LOG_INFO, "%08"PRIX32" ", s->plane_checksums[i]);
      av_log(ctx, AV_LOG_INFO, "]\n");
  
 -    s->frame++;
      return ff_filter_frame(inlink->dst->outputs[0], buf);
  }
  
@@@ -54,11 -57,11 +56,11 @@@ static int filter_frame(AVFilterLink *i
      }
  
      av_log(ctx, AV_LOG_INFO,
 -           "n:%d pts:%"PRId64" pts_time:%f "
 +           "n:%"PRId64" pts:%s pts_time:%s pos:%"PRId64" "
             "fmt:%s sar:%d/%d s:%dx%d i:%c iskey:%d type:%c "
-            "checksum:%08X plane_checksum:[%08X",
 -           "checksum:%"PRIu32" plane_checksum:[%"PRIu32" %"PRIu32" %"PRIu32" %"PRIu32"]\n",
 -           showinfo->frame,
 -           frame->pts, frame->pts * av_q2d(inlink->time_base),
++           "checksum:%08"PRIX32" plane_checksum:[%08"PRIX32,
 +           inlink->frame_count,
 +           av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base), av_frame_get_pkt_pos(frame),
             desc->name,
             frame->sample_aspect_ratio.num, frame->sample_aspect_ratio.den,
             frame->width, frame->height,
             frame->top_field_first   ? 'T' : 'B',    /* Top / Bottom */
             frame->key_frame,
             av_get_picture_type_char(frame->pict_type),
 -           checksum, plane_checksum[0], plane_checksum[1], plane_checksum[2], plane_checksum[3]);
 +           checksum, plane_checksum[0]);
 +
 +    for (plane = 1; plane < 4 && frame->data[plane] && frame->linesize[plane]; plane++)
-         av_log(ctx, AV_LOG_INFO, " %08X", plane_checksum[plane]);
++        av_log(ctx, AV_LOG_INFO, " %08"PRIX32, plane_checksum[plane]);
 +    av_log(ctx, AV_LOG_INFO, "]\n");
  
 -    showinfo->frame++;
      return ff_filter_frame(inlink->dst->outputs[0], frame);
  }