virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
c581cb4e4f
FFmpeg/libavresample
History
Michael Niedermayer c581cb4e4f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Fix even more missing includes after the common.h removal
  build: Factor out rangecoder dependencies to CONFIG_RANGECODER
  build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE
  x86: avcodec: Consistently name all init files
  Add more missing includes after removing the implicit common.h
  Add some more missing includes after removing the implicit common.h
  Don't include common.h from avutil.h
  rtmp: Automatically compute the hash for SWFVerification

Conflicts:
	configure
	doc/APIchanges
	doc/examples/decoding_encoding.c
	libavcodec/Makefile
	libavcodec/assdec.c
	libavcodec/audio_frame_queue.c
	libavcodec/avpacket.c
	libavcodec/dv_profile.c
	libavcodec/dwt.c
	libavcodec/libtheoraenc.c
	libavcodec/rawdec.c
	libavcodec/rv40dsp.c
	libavcodec/tiff.c
	libavcodec/tiffenc.c
	libavcodec/v210dec.h
	libavcodec/vc1dsp.c
	libavcodec/x86/Makefile
	libavfilter/asrc_anullsrc.c
	libavfilter/avfilter.c
	libavfilter/buffer.c
	libavfilter/formats.c
	libavfilter/vf_ass.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_select.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavformat/version.h
	libavutil/audioconvert.c
	libavutil/error.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-16 16:20:30 +02:00
..
x86 x86: add colons after labels 2012-08-07 15:20:56 +01: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 Don't include common.h from avutil.h 2012-08-15 22:32:06 +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