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
03b078721c
FFmpeg/libavfilter
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
..
libmpcodecs lavfi: remove mp=geq filter. 2012-11-11 23:18:12 +01:00
x86 Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415' 2012-11-01 13:11:51 +01:00
af_aconvert.c
af_aformat.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
af_amerge.c lavfi/amerge: clarify the error message in case of input overlap 2012-09-11 18:58:19 +02:00
af_amix.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
af_anull.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
af_aresample.c af_aresample: fix leak on alloc failure 2012-10-11 16:48:25 +02:00
af_asetnsamples.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
af_ashowinfo.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
af_astreamsync.c af_channelmap: require AV_PERM_PRESERVE. 2012-08-17 18:26:39 +02:00
af_asyncts.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
af_atempo.c lavfi/af_atempo: use av_malloc for rDFT buffers. 2012-08-29 18:19:41 +02:00
af_channelmap.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
af_channelsplit.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
af_earwax.c lavfi/earwax: add missing NULL check in filter_samples() 2012-11-04 00:17:27 +01:00
af_join.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
af_pan.c af_pan: fix memleak of arg 2012-10-13 01:51:45 +02:00
af_resample.c lavfi: convert input/ouput list compound literals to named objects 2012-10-10 22:26:12 +01:00
af_silencedetect.c lavfi/silencedetect: export silence info to metadata. 2012-10-21 17:29:11 +02:00
af_volume.c
af_volumedetect.c lavfi/af_volumedetect: print stats in uninit(). 2012-10-25 20:16:09 +02:00
all_channel_layouts.inc
allfilters.c lavfi: add geq filter. 2012-11-11 23:12:54 +01:00
asink_anullsink.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
asrc_abuffer.h
asrc_aevalsrc.c asrc_aevalsrc: Fix use of uninitialized pointer inside av_strtok() 2012-10-11 03:00:34 +02:00
asrc_anullsrc.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
asrc_flite.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
audio.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
audio.h
avcodec.c lavfi/avcodec: check that injected avframes use a supported channel layout 2012-11-10 21:45:34 +01:00
avcodec.h lavfi: add avfilter_get_buffer_ref_from_frame. 2012-07-23 17:14:59 +02:00
avf_concat.c lavfi/concat: implement unsafe mode. 2012-10-28 09:14:34 +01:00
avf_showspectrum.c lavfi: stop using -1 instead use AV_PIX_FMT_NONE/AV_SAMPLE_FMT_NONE 2012-11-05 13:34:08 +00:00
avf_showwaves.c lavfi/showwaves: return error in case of allocation failure in filter_samples() 2012-11-06 22:48:54 +01:00
avfilter.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
avfilter.h Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
avfiltergraph.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
avfiltergraph.h
bbox.c
bbox.h
buffer.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
bufferqueue.h
buffersink.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
buffersink.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
buffersrc.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
buffersrc.h Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521' 2012-09-18 14:45:44 +02:00
drawutils.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
drawutils.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
f_ebur128.c lavfi: stop using -1 instead use AV_PIX_FMT_NONE/AV_SAMPLE_FMT_NONE 2012-11-05 13:34:08 +00:00
f_sendcmd.c lavfi/sendcmd: move buf init() variable to internal scope where it is used 2012-10-23 22:08:55 +02:00
f_setpts.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
f_settb.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
fifo.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
filtfmts.c lavfi: do not use av_pix_fmt_descriptors directly. 2012-10-12 12:45:39 +02:00
formats.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
formats.h
gradfun.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
graphdump.c
graphparser.c Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3' 2012-10-26 14:24:57 +02:00
internal.h lavfi: fix references to avfilter_* functions that don't exist anymore. 2012-10-31 20:54:59 +01:00
lavfutils.c libavfilter/lavfutils: remove useless NULL check on format context 2012-10-17 20:00:31 +02:00
lavfutils.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
libavfilter.v
lswsutils.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
lswsutils.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
Makefile lavfi: remove mp=geq filter. 2012-11-11 23:18:12 +01:00
sink_buffer.c lavfi: stop using -1 instead use AV_PIX_FMT_NONE/AV_SAMPLE_FMT_NONE 2012-11-05 13:34:08 +00:00
split.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
src_buffer.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
src_movie.c lavfi/movie: return proper error code in case of av_get_token() allocation failure 2012-11-06 23:31:16 +01:00
transform.c transform: give avfilter_transform() a return value for returning an error 2012-11-04 01:30:16 +01:00
transform.h transform: give avfilter_transform() a return value for returning an error 2012-11-04 01:30:16 +01:00
version.h lavfi: remove mp=geq filter. 2012-11-11 23:18:12 +01:00
vf_alphaextract.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_alphamerge.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_aspect.c vf_aspect: unbreak avoption system 2012-10-22 13:12:15 +02:00
vf_ass.c lavfi/ass: extend syntax for ass filter 2012-10-15 22:40:08 +02:00
vf_bbox.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_blackdetect.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_blackframe.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
vf_boxblur.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_colormatrix.c Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get 2012-10-20 18:00:13 +02:00
vf_copy.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
vf_crop.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_cropdetect.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_decimate.c Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get 2012-10-20 18:00:13 +02:00
vf_delogo.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_deshake.c Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get 2012-10-20 18:00:13 +02:00
vf_drawbox.c vf_drawbox: dont move uninitialized and then unused colors around 2012-11-06 21:40:23 +01:00
vf_drawtext.c Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f' 2012-11-03 14:24:11 +01:00
vf_edgedetect.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_fade.c vf_fade: fix memleaks of args 2012-10-13 01:08:08 +02:00
vf_field.c lavfi: add field filter 2012-10-31 12:07:11 +01:00
vf_fieldorder.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_format.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
vf_fps.c lavfi/vf_fps: allow to set the rounding method. 2012-10-25 19:42:44 +02:00
vf_framestep.c vf_framestep: fix uninitilaized variable bug 2012-08-30 05:09:15 +02:00
vf_frei0r.c lavfi/frei0r: allow for Windows style paths 2012-10-29 18:50:48 +01:00
vf_geq.c lavfi: add geq filter. 2012-11-11 23:12:54 +01:00
vf_gradfun.c Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507' 2012-10-13 14:14:11 +02:00
vf_hflip.c Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get 2012-10-20 18:00:13 +02:00
vf_hqdn3d.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_hue.c Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get 2012-10-20 18:00:13 +02:00
vf_idet.c Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get 2012-10-20 18:00:13 +02:00
vf_libopencv.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
vf_lut.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_mp.c lavfi: remove mp=geq filter. 2012-11-11 23:18:12 +01:00
vf_null.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
vf_overlay.c Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get 2012-10-20 18:00:13 +02:00
vf_pad.c lavfi: do not use av_pix_fmt_descriptors directly. 2012-10-12 12:45:39 +02:00
vf_pixdesctest.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_removelogo.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_scale.c lavfi/scale: declare the filter private class 2012-11-04 18:01:16 +01:00
vf_select.c lavfi/select: store scene score in buf ref metadata. 2012-10-21 17:29:11 +02:00
vf_setfield.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_showinfo.c vf_showinfo: check return code of av_image_get_linesize() 2012-10-28 00:40:28 +02:00
vf_slicify.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_smartblur.c lavfi/smartblur: add missing draw slice call. 2012-10-30 19:37:20 +01:00
vf_super2xsai.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_swapuv.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_thumbnail.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_tile.c lavfi/tile: extend shorthand parameters. 2012-11-11 22:43:18 +01:00
vf_tinterlace.c vf_tinterlace: check av_image_get_linesize() return value 2012-11-03 02:38:30 +01:00
vf_transpose.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_unsharp.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_vflip.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_yadif.c Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507' 2012-10-13 14:14:11 +02:00
video.c Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get 2012-10-20 18:00:13 +02:00
video.h Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23' 2012-07-29 23:04:49 +02:00
vsink_nullsink.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
vsrc_cellauto.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vsrc_life.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vsrc_mandelbrot.c mandelbrot: fix inner=period coloring routine 2012-10-16 04:00:55 +02:00
vsrc_mptestsrc.c Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get 2012-10-20 18:00:13 +02:00
vsrc_testsrc.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
yadif.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00