ffmpeg/libavfilter
Michael Niedermayer cabbd271a5 Merge remote-tracking branch 'qatar/master'
* qatar/master: (24 commits)
  flvdec: remove incomplete, disabled seeking code
  mem: add support for _aligned_malloc() as found on Windows
  lavc: Extend the documentation for avcodec_init_packet
  flvdec: remove incomplete, disabled seeking code
  http: replace atoll() with strtoll()
  mpegts: remove unused/incomplete/broken seeking code
  af_amix: allow float planar sample format as input
  af_amix: use AVFloatDSPContext.vector_fmac_scalar()
  float_dsp: add x86-optimized functions for vector_fmac_scalar()
  float_dsp: Move vector_fmac_scalar() from libavcodec to libavutil
  lavr: Add x86-optimized function for flt to s32 conversion
  lavr: Add x86-optimized function for flt to s16 conversion
  lavr: Add x86-optimized functions for s32 to flt conversion
  lavr: Add x86-optimized functions for s32 to s16 conversion
  lavr: Add x86-optimized functions for s16 to flt conversion
  lavr: Add x86-optimized function for s16 to s32 conversion
  rtpenc: Support packetizing iLBC
  rtpdec: Add a depacketizer for iLBC
  Implement the iLBC storage file format
  mov: Support muxing/demuxing iLBC
  ...

Conflicts:
	Changelog
	configure
	libavcodec/avcodec.h
	libavcodec/dsputil.c
	libavcodec/version.h
	libavformat/movenc.c
	libavformat/mpegts.c
	libavformat/version.h
	libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-19 20:53:27 +02:00
..
libmpcodecs
x86
Makefile
af_aconvert.c
af_aformat.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
af_amerge.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
af_amix.c Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
af_anull.c
af_aresample.c
af_asetnsamples.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
af_ashowinfo.c
af_astreamsync.c
af_asyncts.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
af_atempo.c libavfilter: improve atempo audio quality 2012-06-19 17:29:27 +02:00
af_channelsplit.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
af_earwax.c
af_pan.c
af_resample.c
af_silencedetect.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
af_volume.c
all_channel_layouts.inc
allfilters.c
asink_anullsink.c
asrc_abuffer.h
asrc_aevalsrc.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
asrc_anullsrc.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
audio.c
audio.h
avcodec.c lavfi/avcodec: make avfilter_fill_frame_from*() functions use avfilter_copy_buf_props() 2012-06-19 16:44:36 +02:00
avcodec.h
avfilter.c lavfi/avfilter: use av_assert 2012-06-19 17:13:45 +02:00
avfilter.h
avfiltergraph.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
avfiltergraph.h
bbox.c
bbox.h
buffer.c
bufferqueue.h
buffersink.c
buffersink.h
buffersrc.c
buffersrc.h
defaults.c
drawutils.c
drawutils.h
formats.c
formats.h
gradfun.h
graphdump.c
graphparser.c
internal.h
lavfutils.c
lavfutils.h
libavfilter.v
lswsutils.c
lswsutils.h
sink_buffer.c
split.c
src_buffer.c
src_movie.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
transform.c
transform.h
version.h
vf_aspect.c
vf_ass.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
vf_bbox.c
vf_blackdetect.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
vf_blackframe.c
vf_boxblur.c
vf_colormatrix.c
vf_copy.c
vf_crop.c
vf_cropdetect.c
vf_delogo.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
vf_deshake.c
vf_drawbox.c
vf_drawtext.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
vf_fade.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
vf_fieldorder.c
vf_fifo.c
vf_format.c
vf_fps.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
vf_frei0r.c
vf_gradfun.c
vf_hflip.c
vf_hqdn3d.c
vf_idet.c
vf_libopencv.c
vf_lut.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
vf_mp.c
vf_null.c
vf_overlay.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
vf_pad.c
vf_pixdesctest.c
vf_removelogo.c
vf_scale.c
vf_select.c
vf_setfield.c
vf_setpts.c
vf_settb.c
vf_showinfo.c
vf_slicify.c
vf_super2xsai.c
vf_swapuv.c
vf_thumbnail.c
vf_tile.c
vf_tinterlace.c
vf_transpose.c
vf_unsharp.c
vf_vflip.c
vf_yadif.c
video.c
video.h
vsink_nullsink.c
vsrc_buffer.h
vsrc_cellauto.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
vsrc_color.c
vsrc_life.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
vsrc_mandelbrot.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
vsrc_mptestsrc.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
vsrc_testsrc.c lavfi: use designated initializers for AVClass 2012-06-17 11:10:10 +00:00
yadif.h