[FFmpeg-cvslog] Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 22 18:43:40 2014 +0100| [8d024c51071ded5e6d4fa500ee5f3c1ce4886d07] | committer: Michael Niedermayer

Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'

* commit 'cc8163e1a3601a56f722a4720516e860bf1c6198':
  avcodec: more correct printf specifiers

Conflicts:
	libavcodec/4xm.c
	libavcodec/alsdec.c
	libavcodec/dfa.c
	libavcodec/h264_ps.c
	libavcodec/jpeg2000dec.c
	libavcodec/lagarith.c
	libavcodec/mpeg12dec.c
	libavcodec/rv10.c
	libavcodec/svq3.c
	libavcodec/wmaprodec.c
	libavcodec/xwddec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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