• Michael Niedermayer's avatar
    Merge commit 'd92024f1' · 28ee7757
    Michael Niedermayer authored
    * commit 'd92024f1':
      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: default avatarMichael Niedermayer <michaelni@gmx.at>
    28ee7757