• Michael Niedermayer's avatar
    Merge commit 'cc8163e1' · 8d024c51
    Michael Niedermayer authored
    * commit 'cc8163e1':
      avcodec: more correct printf specifiers
    
    Conflicts:
    	libavcodec/4xm.c
    	libavcodec/alsdec.c
    	libavcodec/dfa.c
    	libavcodec/h264_ps.c
    	libavcodec/jpeg2000dec.c
    	libavcodec/lagarith.c
    	libavcodec/mpeg12dec.c
    	libavcodec/rv10.c
    	libavcodec/svq3.c
    	libavcodec/wmaprodec.c
    	libavcodec/xwddec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    8d024c51
h264_ps.c 28.9 KB