virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
467dfd5dfa
FFmpeg/libavresample
History
Michael Niedermayer 03b078721c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
  doc: git-howto: Leave reviewers time to react before pushing patches
  Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
  lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	doc/git-howto.texi
	ffmpeg_filter.c
	libavcodec/flacdec.c
	libavcodec/imc.c
	libavcodec/mpegaudiodec.c
	libavcodec/utils.c
	libavfilter/asrc_anullsrc.c
	libavfilter/audio.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/buffer.c
	libavutil/Makefile
	libavutil/audioconvert.h
	libavutil/channel_layout.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 11:32:11 +01:00
..
arm Merge remote-tracking branch 'qatar/master' 2012-09-14 14:13:38 +02:00
x86 x86: PALIGNR: port to cpuflags 2012-11-09 21:31:31 +01: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 Include libavutil/channel_layout.h instead of libavutil/audioconvert.h 2012-11-11 13:35:12 -05:00
internal.h libavresample: add mix level normalization option 2012-08-14 23:36:56 +02:00
libavresample.v
Makefile
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
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