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

…

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 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078'

2012-09-05 14:09:09 +02:00

swresample.h

…