Michael Niedermayer 98840ee017 Merge commit 'c7b610aa0b1bac47eea0056b13fe6e982b85844a' ... * commit 'c7b610aa0b1bac47eea0056b13fe6e982b85844a': avopt: Explicitly store float/double option defaults in .dbl Conflicts: libavcodec/ac3dec.c libavcodec/libx264.c libavfilter/af_amix.c libavfilter/af_asyncts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-09-05 14:44:05 +02:00
..
x86	x86: Split inline and external assembly #ifdefs	2012-08-31 01:53:25 +02:00
Makefile	…
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.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
audio_mix_matrix.c	Don't include common.h from avutil.h	2012-08-15 22:32:06 +03: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	…
options.c	avopt: Explicitly store float/double option defaults in .dbl	2012-09-04 23:13:51 +03:00
resample.c	Don't include common.h from avutil.h	2012-08-15 22:32:06 +03:00
resample.h	…
resample_template.c	Merge remote-tracking branch 'qatar/master'	2012-07-09 22:40:12 +02:00
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