virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
d5f65e9d40
FFmpeg/libavresample
History
Michael Niedermayer d5f65e9d40 Merge commit '124134e42455763b28cc346fed1d07017a76e84e' 
* commit '124134e42455763b28cc346fed1d07017a76e84e':
  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 x86: Split inline and external assembly #ifdefs 2012-08-31 01:53:25 +02:00
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 Add libavresample 2012-04-24 21:28:27 -04:00
audio_mix_matrix.c Don't include common.h from avutil.h 2012-08-15 22:32:06 +03:00
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
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 Add libavresample 2012-04-24 21:28:27 -04:00
Makefile build: cosmetics: Add missing end-of-line backslashes to item lists. 2012-05-07 14:17:40 +02:00
options.c avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member 2012-09-04 23:13:32 +03:00
resample_template.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
resample.c Don't include common.h from avutil.h 2012-08-15 22:32:06 +03:00
resample.h Add libavresample 2012-04-24 21:28:27 -04: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