Files
ffmpeg/libavcodec
Michael Niedermayer a1fc1d2e1b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  pcm-mpeg: improve log message wording
  fate: add missing $(TARGET_PATH) to ac3-fixed-encode
  fate: fix md5sum replacement on some systems
  avprobe: correctly set the default formatter
  lavr: add x86-optimized function for mixing 2 to 1 s16p with q8 coeffs
  lavr: add x86-optimized functions for mixing 2 to 1 s16p with float coeffs
  lavr: add C functions for mixing 2 to 1 channels with s16p format
  avprobe: move formatter functions in the context

Conflicts:
	ffprobe.c
	libavcodec/pcm-mpeg.c
	tests/fate/ac3.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-30 19:32:06 +02:00
..
2012-04-22 22:26:55 +02:00
2012-05-05 22:04:21 +01:00
2012-05-05 22:04:21 +01:00
2012-05-20 16:29:07 +02:00
2012-05-08 00:25:25 +02:00
2012-05-28 18:20:39 +02:00
2012-03-21 03:03:33 +01:00
2012-04-21 19:28:35 +02:00
2012-05-08 23:18:48 +02:00
2012-05-07 18:55:44 +02:00
2012-05-11 03:33:59 +02:00
2012-05-18 23:34:11 +02:00
2012-04-06 22:37:38 +03:00
2012-05-25 13:40:12 +02:00
2012-05-08 22:04:01 +02:00
2012-05-25 13:40:12 +02:00
2012-05-25 13:40:12 +02:00
2012-05-30 07:50:32 +00:00
2012-05-08 08:39:37 +02:00
2012-05-25 13:40:12 +02:00
2012-03-30 20:10:39 +02:00
2012-05-18 23:34:11 +02:00
2012-04-22 22:26:55 +02:00
2012-05-28 17:24:13 +02:00
2012-05-09 11:58:08 +02:00
2012-03-22 13:23:08 +01:00
2012-03-24 23:35:09 +01:00
2012-05-18 23:34:11 +02:00
2012-04-16 16:46:53 +02:00
2012-04-15 18:21:53 +02:00
2012-04-22 22:26:55 +02:00
2012-05-25 13:40:12 +02:00
2012-05-25 13:40:12 +02:00
2012-05-13 11:25:24 +02:00
2012-05-25 13:40:12 +02:00
2012-05-07 20:08:56 +02:00
2012-05-25 13:40:12 +02:00
2012-04-12 11:36:17 +02:00
2012-05-25 13:40:12 +02:00
2012-05-05 02:12:40 +02:00
2012-04-06 22:37:38 +03:00
2012-05-27 01:13:37 +02:00
2012-05-27 01:13:37 +02:00
2012-05-25 13:40:12 +02:00
2012-05-22 11:56:18 +00:00
2012-05-12 03:36:17 +02:00
2012-03-24 17:48:03 +01:00
2012-04-22 22:26:55 +02:00
2012-04-16 18:36:40 +02:00
2012-05-08 11:02:12 +02:00
2012-04-15 20:20:43 +02:00
2012-05-12 10:58:08 +02:00
2012-04-07 19:59:00 +02:00
2012-03-25 12:24:15 +02:00
2012-04-10 23:37:30 +02:00
2012-05-05 02:02:56 +02:00
2012-04-21 18:56:19 +01:00
2012-05-28 17:24:13 +02:00
2012-05-28 17:24:13 +02:00