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
..
x86	lavr: x86: optimized 6-channel flt to fltp conversion	2012-08-23 20:10:57 -04:00
audio_convert.c	Don't include common.h from avutil.h	2012-08-15 22:32:06 +03:00
audio_convert.h	doxygen: Fix function parameter names to match the code	2012-08-09 20:05:55 +02:00
audio_data.c	Don't include common.h from avutil.h	2012-08-15 22:32:06 +03:00
audio_data.h
audio_mix_matrix.c	Don't include common.h from avutil.h	2012-08-15 22:32:06 +03:00
audio_mix.c	Don't include common.h from avutil.h	2012-08-15 22:32:06 +03:00
audio_mix.h	doxygen: Fix function parameter names to match the code	2012-08-09 20:05:55 +02:00
avresample-test.c	Don't include common.h from avutil.h	2012-08-15 22:32:06 +03:00
avresample.h	lavr: resampling: add filter type and Kaiser window beta to AVOptions	2012-07-08 15:22:11 -04:00
internal.h	libavresample: add mix level normalization option	2012-08-14 23:36:56 +02:00
libavresample.v
Makefile	build: cosmetics: Add missing end-of-line backslashes to item lists.	2012-05-07 14:17:40 +02:00
options.c	Don't include common.h from avutil.h	2012-08-15 22:32:06 +03:00
resample_template.c	Merge remote-tracking branch 'qatar/master'	2012-07-09 22:40:12 +02:00
resample.c	Don't include common.h from avutil.h	2012-08-15 22:32:06 +03:00
resample.h
utils.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
version.h	Clarify Doxygen comment for FF_API_* #defines.	2012-07-04 15:10:10 +02:00