wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
FFmpeg/libavresample
History
Michael Niedermayer f479c17894 Merge commit '65830277d2' into release/1.1 
* commit '65830277d2':
  prores: Add a codepath for decoding errors
  nut: Fix unchecked allocations
  avi: directly resync on DV in AVI read failure
  mov: Don't allocate arrays with av_malloc that will be realloced
  shorten: Extend fixed_coeffs to properly support pred_order 0
  Prepare for 9.11 RELEASE
  avi: properly fail if the dv demuxer is missing
  prores: Reject negative run and level values
  audio_mix: fix channel order in mix_1_to_2_fltp_flt_c
  indeo4: Check the inherited quant_mat

Conflicts:
	RELEASE
	libavcodec/indeo4.c
	libavcodec/shorten.c
	libavformat/nut.c
	libavformat/nutdec.c
	libavformat/nutenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-12 16:51:26 +01:00
..
arm Merge remote-tracking branch 'qatar/master' 2012-09-14 14:13:38 +02:00
x86 x86: lavr: use the x86inc.asm automatic stack alignment in mixing functions 2013-01-06 15:46:12 +01:00
audio_convert.c lavr: add option for dithering during sample format conversion to s16 2012-12-19 18:52:54 -05:00
audio_convert.h lavr: add option for dithering during sample format conversion to s16 2012-12-19 18:52:54 -05: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.c audio_mix: fix channel order in mix_1_to_2_fltp_flt_c 2014-01-05 17:21:24 -05:00
audio_mix.h lavr: move AudioMix struct definition to audio_mix.c 2012-12-15 12:26:15 -05:00
audio_mix_matrix.c lavr: temporarily store custom matrix in AVAudioResampleContext 2012-12-11 14:00:32 -05:00
avresample-test.c miscellaneous typo fixes 2012-12-21 00:18:34 +01:00
avresample.h lavr: fix missing " in header documentation 2013-01-04 10:29:55 +02:00
dither.c lavr: add option for dithering during sample format conversion to s16 2012-12-19 18:52:54 -05:00
dither.h lavr: add option for dithering during sample format conversion to s16 2012-12-19 18:52:54 -05:00
internal.h lavr: add option for dithering during sample format conversion to s16 2012-12-19 18:52:54 -05:00
libavresample.v Add libavresample 2012-04-24 21:28:27 -04:00
Makefile lavr: add option for dithering during sample format conversion to s16 2012-12-19 18:52:54 -05:00
options.c lavr: add option for dithering during sample format conversion to s16 2012-12-19 18:52:54 -05:00
resample.c lavr: remove automatic context close/open for resampling compensation 2012-12-16 19:26:17 -05:00
resample.h lavr: do not pass consumed samples as a parameter to ff_audio_resample() 2012-11-27 16:49:19 -05:00
resample_template.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
utils.c Merge commit '0e8ae6d10c' into release/1.1 2014-01-12 16:08:27 +01:00
version.h lavr: add option for dithering during sample format conversion to s16 2012-12-19 18:52:54 -05:00