Michael Niedermayer 45ba9d8545 Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e' ...

* commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e':
  More correct printf format specifiers

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

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

2014-04-02 02:54:09 +02:00

158 KiB

Raw Blame History

View Raw