[FFmpeg-cvslog] Merge commit '6f5ff559dbd01fa4ea96bc0a1d2e0c21f2db8d13'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Apr 17 19:13:25 2016 +0100| [7120bff0a32682c568981cb645a6d15a2b532ee0] | committer: Derek Buitenhuis

Merge commit '6f5ff559dbd01fa4ea96bc0a1d2e0c21f2db8d13'

* commit '6f5ff559dbd01fa4ea96bc0a1d2e0c21f2db8d13':
  intrax8: Adjust printf conversion specifier for sizeof expression

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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

 libavcodec/intrax8.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c
index 3d34cba..41ed506 100644
--- a/libavcodec/intrax8.c
+++ b/libavcodec/intrax8.c
@@ -116,7 +116,8 @@ static av_cold void x8_vlc_init(void){
         init_or_vlc( j_orient_vlc[1][i], x8_orient_lowquant_table [i][0]);
     }
     if (offset != sizeof(table)/sizeof(VLC_TYPE)/2)
-        av_log(NULL, AV_LOG_ERROR, "table size %i does not match needed %i\n", (int)(sizeof(table)/sizeof(VLC_TYPE)/2), offset);
+        av_log(NULL, AV_LOG_ERROR, "table size %zd does not match needed %i\n",
+               sizeof(table) / sizeof(VLC_TYPE) / 2, offset);
 }
 #undef init_or_vlc
 


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