RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/libavfilter
History
Michael Niedermayer 507f2940cc Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3' 
* commit '1b891d17c531e8a63c2974aab4bf997ce70746f3':
  avconv: fix bitrate report when writing to /dev/null
  avfilter: fix graphparser memleaks on error paths
  rawdec: remove ff_raw_read_header
  pcmdec: remove dependency from rawdec
  g722: refactor out of rawdec.c
  rawvideo: use a specific read_header

Conflicts:
	ffmpeg.c
	libavformat/Makefile
	libavformat/rawdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-10-26 14:24:57 +02:00
..
libmpcodecs Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
x86 Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507' 2012-10-13 14:14:11 +02:00
Makefile lavfi: EBU R.128 scanner. 2012-10-01 22:26:19 +02:00
af_aconvert.c
…
af_aformat.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02: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 '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02: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 lavfi/ashowinfo: check plane value before deferencing. 2012-09-30 21:00:52 +02:00
af_astreamsync.c
…
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 '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
af_channelsplit.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
af_earwax.c
…
af_join.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02: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: EBU R.128 scanner. 2012-10-01 22:26:19 +02: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 '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
asrc_flite.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
audio.c lavfi: check that buffer and link properties match. 2012-09-13 20:09:53 +02:00
audio.h
…
avcodec.c lavc: add lavfi metadata support. 2012-10-21 17:29:10 +02:00
avcodec.h
…
avf_concat.c lavfi/avf_concat: fix invalid exclusive test. 2012-10-17 21:28:58 +02:00
avf_showspectrum.c lavfi/showspectrum: add sliding mode. 2012-10-25 22:20:22 +02:00
avf_showwaves.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
avfilter.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
avfilter.h libavfilter: include needed header for AVDictionary 2012-10-24 22:24:54 +02:00
avfiltergraph.c lavfi/avfiltergraph: avoid to print "(null)" in the scale args 2012-10-21 21:44:53 +02:00
avfiltergraph.h
…
bbox.c
…
bbox.h
…
buffer.c lavc: add lavfi metadata support. 2012-10-21 17:29:10 +02:00
bufferqueue.h
…
buffersink.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
buffersink.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
buffersrc.c libavfilter/buffersrc: Do not fail hard on changes of input parameters. 2012-10-17 00:06:12 +02: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/ebur128: fix typo in condition. 2012-10-11 18:41:07 +02: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 '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02: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 Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02: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
sink_buffer.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02: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 Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
transform.c
…
transform.h
…
version.h lavfi/showspectrum: add sliding mode. 2012-10-25 22:20:22 +02: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 Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_drawtext.c lavfi: do not use av_pix_fmt_descriptors directly. 2012-10-12 12:45:39 +02: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_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 Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02: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 vf_mp: fix null ptr deref in case of ENOMEM 2012-10-19 19:59:38 +02: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 Merge remote-tracking branch 'qatar/master' 2012-10-14 15:11:34 +02:00
vf_select.c lavfi/select: store scene score in buf ref metadata. 2012-10-21 17:29:11 +02:00
vf_setfield.c
…
vf_showinfo.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_slicify.c Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627' 2012-10-12 17:04:58 +02:00
vf_smartblur.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_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
…
vf_tinterlace.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_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
…
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