Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 2 Apr 2014 00:54:09 +0000 (02:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 2 Apr 2014 00:54:09 +0000 (02:54 +0200)
commit45ba9d8545829e9c3df1b57de0b00256d8eddaac
treef0c37254e7988fae6ddf702f99da0cf7dac9a2bf
parent119cf2a44b124ac5ed749589a78233272f4101a1
parentcba4e6062a02d5bf684e13a770be88aa1fec717e
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>
libavcodec/g2meet.c
libavcodec/h264_ps.c
libavcodec/h264_refs.c
libavcodec/utvideodec.c
libavcodec/wmaprodec.c
libavcodec/xwddec.c
libavformat/mov.c
libavformat/movenc.c