Michael Niedermayer 99de3df3d3 Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078' ... * commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078': avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member Conflicts: libavcodec/libvpxenc.c libavcodec/options_table.h libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-09-05 14:09:09 +02:00
..
x86	Fix compilation with yasm-0.6.2.	2012-09-01 10:59:16 +02:00
audioconvert.c	swr: fix warning: passing argument 2 of ctx->simd_f from incompatible pointer type	2012-07-02 17:31:16 +02:00
audioconvert.h
dither.c
libswresample.v
Makefile	buildsys: fix rules for swresample-test	2012-06-05 17:27:38 +02:00
rematrix_template.c	swr: fix mix* related function pointer warnings	2012-07-02 17:23:22 +02:00
rematrix.c	swr: fix warning: passing argument 2 of s->mix_any_f from incompatible pointer type	2012-07-02 17:33:27 +02:00
resample_template.c	swr: MMX2 & SSSE3 int16 resample core	2012-06-28 00:36:27 +02:00
resample.c	swr/resample: update SSSE3 flag to new name	2012-09-01 01:29:36 +02:00
swresample_internal.h	swr: resampling: add filter type and Kaiser window beta to AVOptions	2012-07-23 19:23:39 +02:00
swresample-test.c	swr-test: support "--help"	2012-06-05 17:27:38 +02:00
swresample.c	Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078'	2012-09-05 14:09:09 +02:00
swresample.h	swr: resampling: add filter type and Kaiser window beta to AVOptions	2012-07-23 19:23:39 +02:00