xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-02-25 22:56:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
FFmpeg/libavresample
History
Michael Niedermayer 9e89bc37ed Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtmp: Add support for SWFVerification
  api-example: use new video encoding API.
  x86: avcodec: Appropriately name files containing only init functions
  mpegvideo_mmx_template: drop some commented-out cruft
  libavresample: add mix level normalization option
  w32pthreads: Add missing #includes to make header compile standalone
  rtmp: Gracefully ignore _checkbw errors by tracking them
  rtmp: Do not send _checkbw calls as notifications
  prores: interlaced ProRes encoding

Conflicts:
	doc/examples/decoding_encoding.c
	libavcodec/proresenc_kostya.c
	libavcodec/w32pthreads.h
	libavcodec/x86/Makefile
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-15 15:55:24 +02:00
..
x86
x86: add colons after labels
2012-08-07 15:20:56 +01:00
audio_convert.c
Add libavresample
2012-04-24 21:28:27 -04:00
audio_convert.h
doxygen: Fix function parameter names to match the code
2012-08-09 20:05:55 +02:00
audio_data.c
Add libavresample
2012-04-24 21:28:27 -04:00
audio_data.h
Add libavresample
2012-04-24 21:28:27 -04:00
audio_mix_matrix.c
lavr: fix handling of custom mix matrices
2012-08-04 10:28:22 -04:00
audio_mix.c
libavresample: add mix level normalization option
2012-08-14 23:36:56 +02:00
audio_mix.h
doxygen: Fix function parameter names to match the code
2012-08-09 20:05:55 +02:00
avresample-test.c
Add libavresample
2012-04-24 21:28:27 -04: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
libavresample: add mix level normalization option
2012-08-14 23:36:56 +02:00
resample_template.c
Merge remote-tracking branch 'qatar/master'
2012-07-09 22:40:12 +02:00
resample.c
avresample: De-doxygenize some comments where Doxygen is not appropriate
2012-08-11 20:22:01 +02:00
resample.h
Add libavresample
2012-04-24 21:28:27 -04:00
utils.c
Merge remote-tracking branch 'qatar/master'
2012-08-04 23:51:43 +02:00
version.h
Clarify Doxygen comment for FF_API_* #defines.
2012-07-04 15:10:10 +02:00