ffmpeg/libavcodec
Michael Niedermayer bec180e112 Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93'
* commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93': (21 commits)
  cmdutils: fix a memleak when specifying an option twice.
  x86: mpegvideo: more sensible names for optimization file and init function
  x86: mpegvideoenc: Split optimizations off into a separate file
  dnxhdenc: x86: more sensible names for optimization file and init function
  svq1/svq3: Move common code out of SVQ1 decoder-specific file
  dirac: add Comments and references to the standard
  lavr: x86: optimized 6-channel flt to fltp conversion
  lavr: x86: optimized 2-channel flt to fltp conversion
  lavr: x86: optimized 6-channel flt to s16p conversion
  lavr: x86: optimized 2-channel flt to s16p conversion
  lavr: x86: optimized 6-channel s16 to fltp conversion
  lavr: x86: optimized 2-channel s16 to fltp conversion
  lavr: x86: optimized 6-channel s16 to s16p conversion
  lavr: x86: optimized 2-channel s16 to s16p conversion
  lavr: x86: optimized 2-channel fltp to flt conversion
  lavr: x86: optimized 6-channel fltp to s16 conversion
  lavr: x86: optimized 2-channel fltp to s16 conversion
  lavr: x86: optimized 6-channel s16p to flt conversion
  lavr: x86: optimized 2-channel s16p to flt conversion
  lavr: x86: optimized 6-channel s16p to s16 conversion
  ...

Conflicts:
	libavcodec/dirac.c
	libavcodec/mpegvideo.h
	libavcodec/x86/Makefile

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