ffmpeg/libavfilter
Michael Niedermayer c6963a220d Merge remote-tracking branch 'qatar/master'
* qatar/master:
  proresdsp: port x86 assembly to cpuflags.
  lavr: x86: improve non-SSE4 version of S16_TO_S32_SX macro
  lavfi: better channel layout negotiation
  alac: check for truncated packets
  alac: reverse lpc coeff order, simplify filter
  lavr: add x86-optimized mixing functions
  x86: add support for fmaddps fma4 instruction with abstraction to avx/sse
  tscc2: fix typo in array index
  build: use COMPILE template for HOSTOBJS
  build: do full flag handling for all compiler-type tools
  eval: fix printing of NaN in eval fate test.
  build: Rename aandct component to more descriptive aandcttables
  mpegaudio: bury inline asm under HAVE_INLINE_ASM.
  x86inc: automatically insert vzeroupper for YMM functions.
  rtmp: Check the buffer length of ping packets
  rtmp: Allow having more unknown data at the end of a chunk size packet without failing
  rtmp: Prevent reading outside of an allocate buffer when receiving server bandwidth packets

Conflicts:
	Makefile
	configure
	libavcodec/x86/proresdsp.asm
	libavutil/eval.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-27 23:42:19 +02:00
..
libmpcodecs vf_pp: dont pass NULL into pp, it would fail 2012-07-07 19:14:51 +02:00
x86 Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
af_aconvert.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
af_aformat.c Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea' 2012-07-22 22:18:18 +02:00
af_amerge.c lavfi/af_amerge: avfilter_copy_buffer_ref_props will overwrite output pts 2012-07-26 10:05:58 +02:00
af_amix.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
af_anull.c Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea' 2012-07-22 22:18:18 +02:00
af_aresample.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
af_asetnsamples.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
af_ashowinfo.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
af_astreamsync.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
af_asyncts.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
af_atempo.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
af_channelmap.c Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea' 2012-07-22 22:18:18 +02:00
af_channelsplit.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
af_earwax.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
af_join.c lavfi: use avfilter_unref_bufferp() where appropriate. 2012-07-22 09:14:05 +02:00
af_pan.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
af_resample.c lavfi: add error handling to filter_samples(). 2012-07-09 08:25:19 +02:00
af_silencedetect.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
af_volume.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
all_channel_layouts.inc
allfilters.c lavfi: change "transmedia" into "multimedia". 2012-07-23 11:44:48 +02:00
asink_anullsink.c lavfi: use const for AVFilterPad declarations in all filters. 2012-07-21 16:31:15 -07:00
asrc_abuffer.h
asrc_aevalsrc.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
asrc_anullsrc.c Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea' 2012-07-22 22:18:18 +02:00
audio.c Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
audio.h Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
avcodec.c lavfi: add avfilter_get_buffer_ref_from_frame. 2012-07-23 17:14:59 +02:00
avcodec.h lavfi: add avfilter_get_buffer_ref_from_frame. 2012-07-23 17:14:59 +02:00
avf_concat.c lavfi: add concat filter. 2012-07-23 11:34:20 +02:00
avf_showwaves.c lavfi/showwaves: do not set on outlink->out_buf the sent video frame 2012-07-23 15:10:19 +02:00
avfilter.c avfilter: Fix printf format string conversion specifier 2012-07-25 09:24:25 +02:00
avfilter.h lavfi/avfilter.h: add doxy for AVFilterLink.out_buf 2012-07-25 10:03:34 +02:00
avfiltergraph.c Merge remote-tracking branch 'qatar/master' 2012-07-27 23:42:19 +02:00
avfiltergraph.h lavfi/avfiltergraph: apply misc fixes to fix avfilter_graph_request_oldest() @return doxy 2012-07-18 17:13:00 +02:00
bbox.c
bbox.h
buffer.c lavfi: add avfilter_unref_bufferp() 2012-07-20 21:06:18 +02:00
bufferqueue.h
buffersink.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
buffersink.h sink_buffer: implement fixed frame size. 2012-06-30 14:03:54 +02:00
buffersrc.c buffersrc: use avfilter_get_buffer_ref_from_frame. 2012-07-23 17:14:59 +02:00
buffersrc.h lavfi: deprecate av_buffersrc_buffer() function 2012-06-28 22:27:05 +02:00
defaults.c lavfi: drop deprecated and disabled packing API 2012-06-26 11:40:21 +02:00
drawutils.c
drawutils.h
f_settb.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
fifo.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
filtfmts.c Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
formats.c Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63' 2012-06-27 00:34:36 +02:00
formats.h Fix misspellings of FFmpeg 2012-07-19 18:44:46 +02:00
gradfun.h Merge remote-tracking branch 'qatar/master' 2012-07-02 21:19:41 +02:00
graphdump.c lavfi: remove unnecessary inclusion of libavcodec/avcodec.h in avfilter.h 2012-06-25 13:42:37 +02:00
graphparser.c Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63' 2012-06-27 00:34:36 +02:00
internal.h Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
lavfutils.c
lavfutils.h
libavfilter.v
lswsutils.c
lswsutils.h
Makefile lavfi: change "transmedia" into "multimedia". 2012-07-23 11:44:48 +02:00
sink_buffer.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
split.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
src_buffer.c lavfi: remove vsrc_buffer.h API 2012-07-03 01:32:16 +02:00
src_movie.c src_movie: implement multiple outputs. 2012-07-23 17:14:59 +02:00
transform.c libavfilter/transform: fix mirroring. 2012-06-20 23:55:17 +02:00
transform.h
version.h lavfi: add alphaextract and alphamerge filters 2012-07-22 12:17:34 +02:00
vf_alphaextract.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_alphamerge.c vf_alphamerge: Fix reversed conditional 2012-07-27 14:00:04 +02:00
vf_aspect.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_ass.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_bbox.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_blackdetect.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_blackframe.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_boxblur.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_colormatrix.c vf_colormatrix: add missing semicolon 2012-07-23 19:58:13 +00:00
vf_copy.c Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea' 2012-07-22 22:18:18 +02:00
vf_crop.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_cropdetect.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_delogo.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_deshake.c vf_deshake: set cur_buf to NULL. 2012-07-23 22:44:25 +02:00
vf_drawbox.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_drawtext.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_fade.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_fieldorder.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_format.c Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea' 2012-07-22 22:18:18 +02:00
vf_fps.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_frei0r.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_gradfun.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_hflip.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_hqdn3d.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_idet.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_libopencv.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_lut.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_mp.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_null.c Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea' 2012-07-22 22:18:18 +02:00
vf_overlay.c vf_overlay: ensure the overlay frame does not get leaked. 2012-07-26 00:01:04 +02:00
vf_pad.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_pixdesctest.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_removelogo.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_scale.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_select.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_setfield.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_setpts.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_showinfo.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_slicify.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_super2xsai.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_swapuv.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_thumbnail.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_tile.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_tinterlace.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_transpose.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_unsharp.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_vflip.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_yadif.c Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
video.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
video.h Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vsink_nullsink.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vsrc_cellauto.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
vsrc_color.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vsrc_life.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
vsrc_mandelbrot.c lavfi: do not pass opaque field to init functions 2012-07-08 01:18:15 +02:00
vsrc_mptestsrc.c lavfi: decrease logging level of message showing initial parameters 2012-07-15 15:07:03 +02:00
vsrc_testsrc.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
yadif.h Merge remote-tracking branch 'qatar/master' 2012-07-02 21:19:41 +02:00