1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
FFmpeg/libavcodec
Michael Niedermayer 8d024c5107 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>
2014-03-22 18:43:40 +01:00
..
2014-03-22 14:07:03 +01:00
2014-02-12 13:13:17 +00:00
2014-02-17 20:50:33 +01:00
2014-01-09 19:33:07 +01:00
2013-12-15 16:53:32 +01:00
2014-03-22 03:12:18 +01:00
2014-02-07 19:32:16 +00:00
2014-02-18 18:11:23 +01:00
2014-02-06 02:51:19 +01:00
2014-01-02 22:07:09 +01:00
2014-03-19 22:24:32 +01:00
2013-12-31 12:19:59 +01:00
2014-01-10 17:08:04 +01:00
2013-12-31 12:19:59 +01:00
2014-01-31 18:34:14 +01:00
2014-02-21 16:57:26 -03:00
2014-02-21 16:57:26 -03:00
2014-02-10 21:45:55 +01:00
2014-02-10 21:45:55 +01:00
2014-03-16 23:29:51 +01:00
2014-01-04 04:16:46 +01:00
2013-12-10 16:18:51 +01:00
2014-03-16 23:31:29 +01:00
2013-12-22 14:59:31 +01:00
2014-01-27 20:36:42 +01:00
2013-12-22 22:03:47 +01:00
2013-12-22 22:03:47 +01:00