[FFmpeg-cvslog] Merge commit '0b77a5933635293508e7289e7cf191ed166cf070'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu May  4 21:19:41 2017 -0300| [191b2d4fc96fa87975a8eb5d87db04516b8a04c3] | committer: James Almer

Merge commit '0b77a5933635293508e7289e7cf191ed166cf070'

* commit '0b77a5933635293508e7289e7cf191ed166cf070':
  Use correct printf conversion specifiers for POSIX integer types

See 549045254c4614d5d61b5c36e340171a6914d57c

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=191b2d4fc96fa87975a8eb5d87db04516b8a04c3
---

 libavcodec/vorbisdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index bc6c5875c2..9cff6c3e13 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@ -731,7 +731,7 @@ static int vorbis_parse_setup_hdr_residues(vorbis_context *vc)
         if (!res_setup->classifs)
             return AVERROR(ENOMEM);
 
-        ff_dlog(NULL, "    begin %"PRIu32" end %"PRIu32" part.size %d classif.s %d classbook %d \n",
+        ff_dlog(NULL, "    begin %"PRIu32" end %"PRIu32" part.size %u classif.s %"PRIu8" classbook %"PRIu8"\n"
                 res_setup->begin, res_setup->end, res_setup->partition_size,
                 res_setup->classifications, res_setup->classbook);
 


======================================================================

diff --cc libavcodec/vorbisdec.c
index bc6c5875c2,9289c82cf4..9cff6c3e13
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@@ -731,7 -715,7 +731,7 @@@ static int vorbis_parse_setup_hdr_resid
          if (!res_setup->classifs)
              return AVERROR(ENOMEM);
  
-         ff_dlog(NULL, "    begin %"PRIu32" end %"PRIu32" part.size %d classif.s %d classbook %d \n",
 -        ff_dlog(NULL, "    begin %"PRIu32" end %"PRIu32" part.size %u classif.s %"PRIu8" classbook %"PRIu8"\n",
++        ff_dlog(NULL, "    begin %"PRIu32" end %"PRIu32" part.size %u classif.s %"PRIu8" classbook %"PRIu8"\n"
                  res_setup->begin, res_setup->end, res_setup->partition_size,
                  res_setup->classifications, res_setup->classbook);