1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
FFmpeg/libavcodec
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-08 02:09:28 +02:00
2012-10-09 04:00:55 +02:00
2012-10-29 21:13:50 +01:00
2012-10-20 15:33:44 +02:00
2012-10-19 00:08:01 +00:00
2012-10-29 05:21:47 +01:00
2012-10-29 20:06:52 +00:00
2012-10-14 05:48:02 +02:00
2012-10-18 20:29:03 +02:00
2012-10-12 17:58:15 +02:00
2012-09-30 14:05:04 +00:00
2012-10-25 21:51:45 +00:00
2012-10-09 16:48:43 +02:00
2012-10-21 18:22:50 +02:00
2012-10-21 18:22:50 +02:00
2012-10-14 22:16:31 +02:00
2012-10-15 03:18:08 +02:00
2012-10-13 03:54:04 +02:00
2012-10-13 03:54:04 +02:00
2012-10-19 00:08:01 +00:00
2012-10-19 00:08:02 +00:00
2012-10-27 02:06:21 +02:00
2012-10-18 21:42:04 +02:00
2012-10-12 01:44:35 +02:00
2012-10-14 21:45:42 +02:00
2012-10-03 16:14:59 +02:00
2012-10-13 08:22:26 +00:00
2012-10-13 16:02:09 +00:00
2012-10-01 13:42:44 -04:00
2012-10-25 01:38:15 +02:00
2012-10-29 20:06:52 +00:00
2012-10-15 15:09:46 +02:00
2012-10-08 09:06:25 +00:00
2012-10-08 09:06:25 +00:00
2012-10-08 22:49:23 -05:00
2012-10-21 17:29:10 +02:00
2012-10-19 03:36:42 +02:00
2012-10-12 18:17:10 +03:00
2012-10-10 16:48:13 +00:00
2012-10-31 03:44:37 +00:00
2012-10-27 04:32:40 +02:00
2012-10-13 18:00:48 +00:00
2012-10-15 13:28:23 +00:00