Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 20:05:34 +0000 (21:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 20:05:34 +0000 (21:05 +0100)
commit28ee7757f5b0859510e3af6bf49fca9881f09966
tree6b6e7ab386a73b664aac3ce21c4ee0d3dff38d4a
parent5171ae781a240cac3860c20f9aefc6d1b2c61cac
parentd92024f18fa3d69937cb2575f3a8bf973df02430
Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

* commit 'd92024f18fa3d69937cb2575f3a8bf973df02430':
  lavf: more correct printf format specifiers

Conflicts:
libavformat/asfdec.c
libavformat/cafdec.c
libavformat/dxa.c
libavformat/framecrcenc.c
libavformat/hnm.c
libavformat/iff.c
libavformat/mov.c
libavformat/mxfdec.c
libavformat/rmdec.c
libavformat/rpl.c
libavformat/smacker.c
libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
26 files changed:
libavformat/apetag.c
libavformat/asfdec.c
libavformat/avidec.c
libavformat/bink.c
libavformat/cafdec.c
libavformat/crcenc.c
libavformat/dfa.c
libavformat/dxa.c
libavformat/electronicarts.c
libavformat/framecrcenc.c
libavformat/gxf.c
libavformat/hnm.c
libavformat/iff.c
libavformat/lxfdec.c
libavformat/matroskadec.c
libavformat/mov.c
libavformat/mvi.c
libavformat/mxfdec.c
libavformat/omadec.c
libavformat/rmdec.c
libavformat/rpl.c
libavformat/smacker.c
libavformat/smjpegdec.c
libavformat/spdifenc.c
libavformat/wtvdec.c
libavformat/xmv.c