Michael Niedermayer cd6f5c4895 Merge commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702' ... * commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702': swscale: Do not make ff_ symbols globally visible. rtspdec: use av_strlcpy for writing into fixed size buffer g722enc: fix size argument in memset http: use av_strlcpy instead of strcpy() without size checks avfilter: correct memcpy size avfilter_copy_buf_props() lavc: split asv12 encoder/decoder Conflicts: libavcodec/asvdec.c libavfilter/buffer.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-10-10 14:07:05 +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
af_aconvert.c
af_aformat.c
af_amerge.c
af_amix.c	Merge commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a'	2012-10-10 13:18:05 +02:00
af_anull.c
af_aresample.c
af_asetnsamples.c
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
af_channelmap.c	Merge commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a'	2012-10-10 13:18:05 +02:00
af_channelsplit.c
af_earwax.c
af_join.c
af_pan.c
af_resample.c	af_resample: unref out_buf when avresample_convert returns 0	2012-10-09 18:43:30 +02:00
af_silencedetect.c	lavfi/silencedetect: add av_opt_free() call.	2012-10-09 22:37:29 +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
asrc_abuffer.h
asrc_aevalsrc.c
asrc_anullsrc.c
asrc_flite.c
audio.c
audio.h
avcodec.c	Merge commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702'	2012-10-10 14:07:05 +02:00
avcodec.h
avf_concat.c
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	avfilter: correct memcpy size avfilter_copy_buf_props()	2012-10-09 21:05:14 +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
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
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
Makefile	lavfi: EBU R.128 scanner.	2012-10-01 22:26:19 +02:00
sink_buffer.c	Merge commit '716d413c13981da15323c7a3821860536eefdbbb'	2012-10-08 21:06:57 +02:00
split.c
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
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_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
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