Michael Niedermayer d46c1c72e4 Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' ... * commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-09-05 14:33:32 +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_template.c
rematrix.c
resample_template.c
resample.c	swr/resample: update SSSE3 flag to new name	2012-09-01 01:29:36 +02:00
swresample_internal.h
swresample-test.c
swresample.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
swresample.h