Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 17:43:40 +0000 (18:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 17:43:40 +0000 (18:43 +0100)
commit8d024c51071ded5e6d4fa500ee5f3c1ce4886d07
tree1a10423704449a31e1fc8cd26f795ecb07b6f860
parent7ef8d97b1aa9e142527debcaf993aa1ee8f08a9b
parentcc8163e1a3601a56f722a4720516e860bf1c6198
Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'

* commit 'cc8163e1a3601a56f722a4720516e860bf1c6198':
  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: Michael Niedermayer <michaelni@gmx.at>
26 files changed:
libavcodec/4xm.c
libavcodec/aic.c
libavcodec/alac.c
libavcodec/alsdec.c
libavcodec/apedec.c
libavcodec/bmp.c
libavcodec/cllc.c
libavcodec/dfa.c
libavcodec/dxtory.c
libavcodec/g2meet.c
libavcodec/h264_ps.c
libavcodec/ivi_common.c
libavcodec/jpeg2000dec.c
libavcodec/lagarith.c
libavcodec/metasound.c
libavcodec/mjpegbdec.c
libavcodec/mpeg12dec.c
libavcodec/mss12.c
libavcodec/rv10.c
libavcodec/svq3.c
libavcodec/truemotion2.c
libavcodec/tscc2.c
libavcodec/utvideodec.c
libavcodec/wmalosslessdec.c
libavcodec/wmaprodec.c
libavcodec/xwddec.c