Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 2 Apr 2014 00:54:09 +0000 (02:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 2 Apr 2014 00:54:09 +0000 (02:54 +0200)
* commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e':
  More correct printf format specifiers

Conflicts:
libavcodec/h264_ps.c
libavcodec/h264_refs.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/g2meet.c
libavcodec/h264_ps.c
libavcodec/h264_refs.c
libavcodec/utvideodec.c
libavcodec/wmaprodec.c
libavcodec/xwddec.c
libavformat/mov.c
libavformat/movenc.c

Simple merge
@@@ -548,7 -495,7 +548,7 @@@ int ff_h264_decode_seq_parameter_set(H2
      if (h->avctx->debug & FF_DEBUG_PICT_INFO) {
          static const char csp[4][5] = { "Gray", "420", "422", "444" };
          av_log(h->avctx, AV_LOG_DEBUG,
-                "sps:%u profile:%d/%d poc:%d ref:%d %dx%d %s %s crop:%u/%u/%u/%u %s %s %d/%d b%d reo:%d\n",
 -               "sps:%u profile:%d/%d poc:%d ref:%d %dx%d %s %s crop:%u/%u/%u/%u %s %s %"PRId32"/%"PRId32"\n",
++               "sps:%u profile:%d/%d poc:%d ref:%d %dx%d %s %s crop:%u/%u/%u/%u %s %s %"PRId32"/%"PRId32" b%d reo:%d\n",
                 sps_id, sps->profile_idc, sps->level_idc,
                 sps->poc_type,
                 sps->ref_frame_count,
@@@ -25,7 -25,8 +25,9 @@@
   * @author Michael Niedermayer <michaelni@gmx.at>
   */
  
+ #include <inttypes.h>
 +#include "libavutil/avassert.h"
  #include "internal.h"
  #include "avcodec.h"
  #include "h264.h"
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge