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 ac627b3d38 Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 
* commit '716d413c13981da15323c7a3821860536eefdbbb':
  Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat

Conflicts:
	doc/examples/muxing.c
	ffmpeg.h
	ffmpeg_filter.c
	ffmpeg_opt.c
	ffplay.c
	ffprobe.c
	libavcodec/8bps.c
	libavcodec/aasc.c
	libavcodec/aura.c
	libavcodec/avcodec.h
	libavcodec/avs.c
	libavcodec/bfi.c
	libavcodec/bmp.c
	libavcodec/bmpenc.c
	libavcodec/c93.c
	libavcodec/cscd.c
	libavcodec/cyuv.c
	libavcodec/dpx.c
	libavcodec/dpxenc.c
	libavcodec/eatgv.c
	libavcodec/escape124.c
	libavcodec/ffv1.c
	libavcodec/flashsv.c
	libavcodec/fraps.c
	libavcodec/h264.c
	libavcodec/huffyuv.c
	libavcodec/iff.c
	libavcodec/imgconvert.c
	libavcodec/indeo3.c
	libavcodec/kmvc.c
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/libx264.c
	libavcodec/ljpegenc.c
	libavcodec/mjpegdec.c
	libavcodec/mjpegenc.c
	libavcodec/motionpixels.c
	libavcodec/mpeg12.c
	libavcodec/mpeg12enc.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pamenc.c
	libavcodec/pcxenc.c
	libavcodec/pgssubdec.c
	libavcodec/pngdec.c
	libavcodec/pngenc.c
	libavcodec/pnm.c
	libavcodec/pnmdec.c
	libavcodec/pnmenc.c
	libavcodec/ptx.c
	libavcodec/qdrw.c
	libavcodec/qpeg.c
	libavcodec/qtrleenc.c
	libavcodec/raw.c
	libavcodec/rawdec.c
	libavcodec/rl2.c
	libavcodec/sgidec.c
	libavcodec/sgienc.c
	libavcodec/snowdec.c
	libavcodec/snowenc.c
	libavcodec/sunrast.c
	libavcodec/targa.c
	libavcodec/targaenc.c
	libavcodec/tiff.c
	libavcodec/tiffenc.c
	libavcodec/tmv.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavcodec/vb.c
	libavcodec/vp3.c
	libavcodec/wnv1.c
	libavcodec/xl.c
	libavcodec/xwddec.c
	libavcodec/xwdenc.c
	libavcodec/yop.c
	libavdevice/v4l2.c
	libavdevice/x11grab.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersrc.c
	libavfilter/drawutils.c
	libavfilter/formats.c
	libavfilter/src_movie.c
	libavfilter/vf_ass.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_format.c
	libavfilter/vf_hflip.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_transpose.c
	libavfilter/vf_yadif.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavformat/movenc.c
	libavformat/mxf.h
	libavformat/utils.c
	libavformat/yuv4mpeg.c
	libavutil/imgutils.c
	libavutil/pixdesc.c
	libswscale/input.c
	libswscale/output.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	libswscale/x86/yuv2rgb.c
	libswscale/x86/yuv2rgb_template.c
	libswscale/yuv2rgb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-10-08 21:06:57 +02:00
..
libmpcodecs Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
x86 hqdn3d: Fix out of array read in LOWPASS 2012-09-22 03:17:28 +02:00
Makefile lavfi: EBU R.128 scanner. 2012-10-01 22:26:19 +02:00
af_aconvert.c
…
af_aformat.c
…
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 '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521' 2012-09-18 14:45:44 +02:00
af_anull.c
…
af_aresample.c lavfi/aresample: set buffer properties after copy. 2012-09-13 12:05:19 +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 remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +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
…
af_channelsplit.c Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521' 2012-09-18 14:45:44 +02:00
af_earwax.c
…
af_join.c Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521' 2012-09-18 14:45:44 +02:00
af_pan.c af_pan: Fix sscanf formats to work with buggy sscanf implementations 2012-09-15 19:49:34 -04:00
af_resample.c af_resample: avoid conversion of identical sample formats for 1 channel 2012-10-07 16:45:50 -04:00
af_silencedetect.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
af_volume.c
…
af_volumedetect.c
…
all_channel_layouts.inc
…
allfilters.c lavfi: EBU R.128 scanner. 2012-10-01 22:26:19 +02:00
asink_anullsink.c Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521' 2012-09-18 14:45:44 +02:00
asrc_abuffer.h
…
asrc_aevalsrc.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
asrc_anullsrc.c Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521' 2012-09-18 14:45:44 +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 lavfi/avcodec: apply cosmetics style fixes 2012-09-14 11:06:40 +02:00
avcodec.h
…
avf_concat.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
avf_showspectrum.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
avf_showwaves.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
avfilter.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
avfilter.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
avfiltergraph.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
avfiltergraph.h
…
bbox.c
…
bbox.h
…
buffer.c lavfi: add qp_table_size 2012-09-07 13:00:47 +02:00
bufferqueue.h
…
buffersink.c lavfi/sink_buffer: implement libav compatibility API. 2012-09-27 18:43:37 +02:00
buffersink.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
buffersrc.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
buffersrc.h Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521' 2012-09-18 14:45:44 +02:00
drawutils.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
drawutils.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
f_ebur128.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
f_sendcmd.c lavfi: add asendcmd and sendcmd filters 2012-09-23 00:50:06 +02:00
f_setpts.c lavfi/setpts: set SAMPLE_RATE to NAN when input is no audio 2012-09-10 18:52:28 +02:00
f_settb.c
…
fifo.c
…
filtfmts.c libavfilter/filtfmts: fix argv/argc checks 2012-09-19 22:43:03 +02:00
formats.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
formats.h
…
gradfun.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
graphdump.c
…
graphparser.c
…
internal.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
lavfutils.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +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 '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521' 2012-09-18 14:45:44 +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/transpose: add passthrough option 2012-10-02 09:43:06 +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_ass.c lavfi/ass: mark ass_libavfilter_log_level_map as static const. 2012-09-16 02:59:43 +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 '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_boxblur.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_colormatrix.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_copy.c
…
vf_crop.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_cropdetect.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_decimate.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_delogo.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_deshake.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_drawbox.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_drawtext.c Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat 2012-10-08 07:13:26 +02:00
vf_edgedetect.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_fade.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_fieldorder.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_format.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_fps.c
…
vf_framestep.c vf_framestep: fix uninitilaized variable bug 2012-08-30 05:09:15 +02:00
vf_frei0r.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_gradfun.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_hflip.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_hqdn3d.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_hue.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_idet.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_libopencv.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_lut.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_mp.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_null.c
…
vf_overlay.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_pad.c Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat 2012-10-08 07:13:26 +02:00
vf_pixdesctest.c
…
vf_removelogo.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_scale.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_select.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_setfield.c
…
vf_showinfo.c
…
vf_slicify.c
…
vf_smartblur.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +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 Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_transpose.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_unsharp.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vf_vflip.c
…
vf_yadif.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
video.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
video.h
…
vsink_nullsink.c Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521' 2012-09-18 14:45:44 +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 Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vsrc_mptestsrc.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vsrc_testsrc.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
yadif.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00