Michael Niedermayer d5f65e9d40 Merge commit '124134e424' ... * commit '124134e424': avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member Conflicts: libavcodec/aacenc.c libavcodec/libopenjpegenc.c libavcodec/options_table.h libavdevice/bktr.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/vf_drawtext.c libavformat/movenc.c libavformat/options_table.h libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-09-05 13:58:11 +02:00
..
x86	Fix compilation with yasm-0.6.2.	2012-09-01 10:59:16 +02:00
audioconvert.c
audioconvert.h
dither.c
libswresample.v
Makefile
rematrix.c
rematrix_template.c
resample.c	swr/resample: update SSSE3 flag to new name	2012-09-01 01:29:36 +02:00
resample_template.c
swresample-test.c
swresample.c	Merge commit '124134e424'	2012-09-05 13:58:11 +02:00
swresample.h
swresample_internal.h