generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3c4aa50620
ffmpeg/libavresample
History
Michael Niedermayer e79c3858b3 Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8' 
* commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8':
  dv: use AVStream.index instead of abusing AVStream.id
  lavfi: add ashowinfo filter
  avcodec: Add a RFC 3389 comfort noise codec
  lpc: Add a function for calculating reflection coefficients from samples
  lpc: Add a function for calculating reflection coefficients from autocorrelation coefficients
  lavr: document upper bound on number of output samples.
  lavr: add general API usage doxy
  indeo3: remove duplicate capabilities line.
  fate: ac3: Add dependencies

Conflicts:
	Changelog
	doc/filters.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h
	libavfilter/Makefile
	libavfilter/af_ashowinfo.c
	libavfilter/allfilters.c
	libavfilter/version.h
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30 14:40:22 +01:00
..
arm Merge remote-tracking branch 'qatar/master' 2012-09-14 14:13:38 +02:00
x86 lavr: handle clipping in the float to s32 conversion 2012-10-13 12:34:34 +02:00
audio_convert.c ARM: libavresample: NEON optimised flat float to s16 conversion 2012-09-13 19:15:42 +01:00
audio_convert.h ARM: libavresample: NEON optimised flat float to s16 conversion 2012-09-13 19:15:42 +01:00
audio_data.c lavr: change the type of the data buffers to uint8_t**. 2012-10-05 13:49:44 +02:00
audio_data.h lavr: change the type of the data buffers to uint8_t**. 2012-10-05 13:49:44 +02:00
audio_mix_matrix.c lavr/audio_mix_matrix: acknowledge the existence of LFE2. 2012-09-12 18:26:53 -04: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 lavr: change the type of the data buffers to uint8_t**. 2012-10-05 13:49:44 +02:00
avresample.h lavr: document upper bound on number of output samples. 2012-10-29 20:05:47 +01: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: Explicitly store float/double option defaults in .dbl 2012-09-04 23:13:51 +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-10-06 13:45:08 +02:00
version.h lavr: bump major to 1 and declare it stable. 2012-10-05 13:50:13 +02:00