[FFmpeg-cvslog] Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 11 21:05:34 2014 +0100| [28ee7757f5b0859510e3af6bf49fca9881f09966] | committer: Michael Niedermayer

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 at gmx.at>

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