ffmpeg/libavformat
Michael Niedermayer cd8cb54990 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ARM: ac3dsp: optimised update_bap_counts()
  mpegaudiodec: Fix av_dlog() invocation.
  h264/10bit: add HAVE_ALIGNED_STACK checks.
  Update 8-bit H.264 IDCT function names to reflect bit-depth.
  Add IDCT functions for 10-bit H.264.
  mpegaudioenc: Fix broken av_dlog statement.
  Employ correct printf format specifiers, mostly in debug output.
  ARM: fix MUL64 inline asm for pre-armv6

Conflicts:
	libavcodec/mpegaudioenc.c
	libavformat/ape.c
	libavformat/mxfdec.c
	libavformat/r3d.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-02 05:12:10 +02:00
..
2011-05-30 00:24:01 +02:00
2011-05-06 17:39:31 +02:00
2011-05-15 03:25:57 +02:00
2011-05-30 00:24:01 +02:00
2011-05-13 04:40:40 +02:00
2011-04-17 23:43:54 +02:00
2011-05-30 00:24:01 +02:00
2011-04-04 02:15:12 +02:00
2011-04-07 03:32:26 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-05-07 20:14:47 +02:00
2011-04-04 02:15:12 +02:00
2011-04-09 03:17:07 +02:00
2011-04-10 03:32:29 +02:00
2011-04-09 03:17:07 +02:00
2011-04-30 01:58:26 +02:00
2011-05-05 03:30:24 +02:00
2011-04-04 02:15:12 +02:00
2011-04-18 18:23:16 +02:00
2011-04-21 03:37:05 +02:00
2011-04-09 03:17:07 +02:00
2011-04-04 02:15:12 +02:00
2011-04-17 23:43:54 +02:00
2011-05-28 18:23:35 +02:00
2011-05-24 01:31:53 +02:00
2011-04-17 23:43:54 +02:00
2011-04-07 03:32:26 +02:00
2011-04-20 04:48:23 +02:00
2011-04-07 03:32:26 +02:00
2011-04-20 04:48:23 +02:00
2011-04-20 04:48:23 +02:00
2011-04-20 04:48:23 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 01:29:40 +02:00
2011-05-30 00:24:01 +02:00
2011-04-20 04:48:23 +02:00
2011-04-20 04:48:23 +02:00
2011-05-30 00:24:01 +02:00
2011-04-04 02:15:12 +02:00
2011-05-28 04:11:26 +02:00
2011-04-20 04:48:23 +02:00
2011-05-07 09:47:35 +02:00
2011-05-30 00:24:01 +02:00
2011-04-23 01:09:43 +02:00
2011-04-24 03:41:22 +02:00
2011-05-24 01:31:53 +02:00
2011-05-30 00:24:01 +02:00
2011-05-30 00:24:01 +02:00
2011-04-04 02:15:12 +02:00
2011-05-30 00:24:01 +02:00
2011-04-04 02:15:12 +02:00
2011-04-09 03:17:07 +02:00
2011-04-24 03:41:22 +02:00
2011-05-13 04:40:40 +02:00
2011-04-24 03:41:22 +02:00
2011-05-20 01:44:10 +02:00
2011-05-20 01:44:10 +02:00
2011-05-10 04:03:17 +02:00
2011-04-09 03:17:07 +02:00
2011-04-20 04:48:23 +02:00
2011-04-20 04:48:23 +02:00
2011-05-30 00:24:01 +02:00
2011-05-20 01:44:10 +02:00
2011-04-02 01:54:27 +02:00
2011-05-30 00:24:01 +02:00
2011-05-30 00:24:01 +02:00
2011-04-04 02:15:12 +02:00
2011-05-30 02:39:26 +02:00
2011-05-30 00:03:06 +02:00
2011-04-04 02:15:12 +02:00
2011-05-01 21:13:18 +02:00
2011-05-01 21:13:18 +02:00
2011-04-04 02:15:12 +02:00