Michael Niedermayer
3174616f59
Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' ...
* commit '6860b4081d046558c44b1b42f22022ea341a2a73':
x86: include x86inc.asm in x86util.asm
cng: Reindent some incorrectly indented lines
cngdec: Allow flushing the decoder
cngdec: Make the dbov variable have the right unit
cngdec: Fix the memset size to cover the full array
cngdec: Update the LPC coefficients after averaging the reflection coefficients
configure: fix print_config() with broke awks
Conflicts:
libavcodec/x86/ac3dsp.asm
libavcodec/x86/dct32.asm
libavcodec/x86/deinterlace.asm
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputilenc.asm
libavcodec/x86/fft.asm
libavcodec/x86/fmtconvert.asm
libavcodec/x86/h264_chromamc.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_deblock_10bit.asm
libavcodec/x86/h264_idct.asm
libavcodec/x86/h264_idct_10bit.asm
libavcodec/x86/h264_intrapred.asm
libavcodec/x86/h264_intrapred_10bit.asm
libavcodec/x86/h264_weight.asm
libavcodec/x86/vc1dsp.asm
libavcodec/x86/vp3dsp.asm
libavcodec/x86/vp56dsp.asm
libavcodec/x86/vp8dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31 13:43:33 +01:00
2012-10-12 14:26:46 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2012-07-11 04:04:29 +02:00
2012-09-24 13:41:48 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2012-10-31 13:43:33 +01:00
2012-02-04 20:27:02 +01:00
2011-11-23 04:02:17 +01:00
2012-10-28 14:33:41 +01:00
2012-10-28 14:33:41 +01:00
2012-07-16 19:30:13 +00:00
2012-08-15 22:32:06 +03:00
2012-04-20 09:43:11 -04:00
2012-09-13 15:35:50 +02:00
2012-09-13 15:35:50 +02:00
2011-05-22 04:53:19 +02:00
2012-10-13 16:39:42 +02:00
2011-12-13 00:39:48 +01:00
2012-10-30 14:40:22 +01:00
2012-01-22 23:06:04 +01:00
2011-11-23 04:02:17 +01:00
2012-10-04 12:30:25 +02:00
2012-07-04 23:23:17 +02:00
2012-09-15 19:47:10 -04:00
2012-07-31 13:15:43 +02:00
2011-12-13 00:39:48 +01:00
2011-03-19 13:33:20 +00:00
2012-10-27 00:26:35 +02:00
2012-09-05 14:09:09 +02:00
2012-10-01 16:41:37 +02:00
2011-03-19 13:33:20 +00:00
2011-12-05 00:11:57 +01:00
2012-01-29 00:34:59 +01:00
2012-09-19 21:57:58 +02:00
2011-09-21 21:25:43 +02:00
2012-08-16 16:20:30 +02:00
2012-10-06 13:45:08 +02:00
2012-10-22 14:39:12 +02:00
2012-10-22 14:39:12 +02:00
2012-10-14 14:46:13 +02:00
2011-12-12 01:25:37 +01:00
2012-05-15 18:08:32 +02:00
2012-10-23 15:00:27 +02:00
2012-10-11 17:09:57 +02:00
2012-08-16 16:20:30 +02:00
2012-06-19 20:53:27 +02:00
2012-06-19 20:53:27 +02:00
2012-10-14 15:11:34 +02:00
2012-10-14 15:11:34 +02:00
2012-08-09 01:44:15 +02:00
2011-06-28 13:14:46 +02:00
2012-10-19 13:29:24 +02:00
2012-01-29 00:34:59 +01:00
2011-12-12 01:25:37 +01:00
2012-07-02 14:05:40 +03:00
2012-10-21 16:13:55 +02:00
2012-10-24 14:01:36 +02:00
2012-10-01 10:24:28 +02:00
2012-10-06 13:45:08 +02:00
2012-10-23 13:34:42 +02:00
2012-10-24 12:53:26 +02:00
2011-07-12 01:42:32 +02:00
2011-03-19 13:33:20 +00:00
2012-10-13 14:24:58 +02:00
2012-10-21 13:35:42 +02:00
2012-08-16 16:20:30 +02:00
2012-07-07 01:41:55 +00:00
2012-10-25 13:15:58 +02:00
2012-10-25 13:15:58 +02:00
2012-10-26 15:20:48 +02:00
2012-10-27 00:26:35 +02:00
2012-10-27 02:58:09 +02:00
2012-10-28 14:33:41 +01:00
2012-10-28 14:33:41 +01:00
2012-10-25 13:15:58 +02:00
2012-10-25 13:15:58 +02:00
2012-10-08 19:42:49 +02:00
2012-10-23 07:33:05 +02:00
2012-10-23 07:33:05 +02:00
2012-10-29 17:39:26 +01:00
2012-09-06 00:40:01 +02:00
2012-10-06 14:03:15 +02:00
2011-06-29 23:49:03 +01:00
2012-10-30 17:47:36 +01:00
2012-10-12 15:34:49 +02:00
2012-10-30 17:47:36 +01:00
2012-06-22 22:48:00 +02:00
2012-10-12 14:15:33 +02:00
2011-11-23 04:02:17 +01:00
2012-03-26 13:00:09 +02:00
2012-08-05 22:17:02 +02:00
2011-03-19 13:33:20 +00:00
2011-06-24 03:07:04 +02:00
2012-10-23 07:33:05 +02:00
2012-10-23 07:33:05 +02:00
2012-10-28 14:33:41 +01:00
2012-10-28 14:33:41 +01:00
2011-05-11 13:43:30 +02:00
2011-05-11 13:43:30 +02:00
2012-06-22 22:34:02 +02:00
2012-06-22 22:34:02 +02:00
2012-08-08 09:11:26 +02:00
2012-08-08 09:11:26 +02:00
2012-08-16 16:20:30 +02:00
2012-06-10 00:37:02 +02:00
2012-10-31 03:10:35 +01:00
2012-10-28 14:33:41 +01:00
2012-10-08 21:06:57 +02:00
2012-10-27 00:26:35 +02:00
2012-09-13 19:31:02 +02:00
2012-10-01 22:24:17 +02:00
2012-10-20 01:56:50 +02:00
2012-10-08 03:44:18 +02:00
2012-08-10 16:25:23 +02:00
3174616f59