[FFmpeg-cvslog] Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  2 02:54:09 2014 +0200| [45ba9d8545829e9c3df1b57de0b00256d8eddaac] | committer: Michael Niedermayer

Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'

* commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e':
  More correct printf format specifiers

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

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

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