MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
a62242678f
ffmpeg/libswresample
History
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
..
arm ARM: libswresample: NEON optimised generic fltp to s16 conversion 2012-09-24 23:19:32 +02:00
x86 Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
audioconvert.c swr: make sure the last data element is NULL so we can use it to detect the number of channels 2012-09-24 23:19:32 +02:00
audioconvert.h
dither.c
libswresample.v
log2_tab.c swresample: include ff_log2_tab for shared builds 2012-10-20 01:58:04 +02:00
Makefile swresample: include ff_log2_tab for shared builds 2012-10-20 01:58:04 +02:00
rematrix_template.c swr: use 64bit index/len for x86_64 mix 2012-10-28 02:09:08 +02:00
rematrix.c swr/rematrix: fix C99 left shift overflow 2012-10-14 03:48:05 +02:00
resample_template.c
resample.c swri_resample_init: unsupported sample formats are an internal error. 2012-10-11 04:36:23 +02:00
swresample_internal.h swr: use 64bit index/len for x86_64 mix 2012-10-28 02:09:08 +02:00
swresample-test.c swr-test: fix division by 0 2012-10-16 19:40:57 +02:00
swresample.c swr: make sure the last data element is NULL so we can use it to detect the number of channels 2012-09-24 23:19:32 +02:00
swresample.h swresample: Create version.h header 2012-09-28 15:10:36 +02:00
version.h swresample: Create version.h header 2012-09-28 15:10:36 +02:00