ffmpeg/libavfilter
Michael Niedermayer c065255bba Merge remote-tracking branch 'qatar/master'
* qatar/master:
  aacenc: Fix LONG_START windowing.
  aacenc: Fix a bug where deinterleaved samples were stored in the wrong place.
  avplay: use the correct array size for stride.
  lavc: extend doxy for avcodec_alloc_context3().
  APIchanges: mention avcodec_alloc_context()/2/3
  avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS.
  aacsbr: ARM NEON optimised sbrdsp functions
  aacsbr: align some arrays
  aacsbr: move some simdable loops to function pointers
  cosmetics: Remove extra newlines at EOF

Conflicts:
	libavcodec/utils.c
	libavfilter/formats.c
	libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-29 00:34:59 +01:00
..
libmpcodecs Fix "ouput" typo and add a check. 2012-01-28 11:04:19 +01:00
x86
Makefile Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
af_aconvert.c Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
af_aconvert_rematrix.c
af_aformat.c
af_amerge.c lavfi: add amerge audio filter. 2011-12-31 16:25:11 +01:00
af_anull.c
af_aresample.c
af_ashowinfo.c
af_asplit.c lavfi: add asplit filter 2011-12-27 15:21:08 +01:00
af_astreamsync.c af_astreamsync: remove unused variable 2012-01-01 16:43:32 +01:00
af_earwax.c
af_pan.c pan: drop unecessary includes. 2012-01-24 10:43:42 +01:00
af_silencedetect.c lavfi: add audio silencedetect filter. 2012-01-08 17:08:55 +01:00
af_volume.c volume: remove duplicated condition. 2012-01-05 21:53:18 +01:00
all_channel_layouts.h
allfilters.c lavfi: add audio silencedetect filter. 2012-01-08 17:08:55 +01:00
asink_anullsink.c
asrc_abuffer.c Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
asrc_abuffer.h
asrc_aevalsrc.c aevalsrc: add duration option 2011-12-04 21:13:22 +01:00
asrc_anullsrc.c Merge remote-tracking branch 'qatar/master' 2011-11-26 01:12:08 +01:00
avcodec.c Merge remote-tracking branch 'qatar/master' 2011-12-26 04:10:47 +01:00
avcodec.h Merge remote-tracking branch 'qatar/master' 2011-12-26 04:10:47 +01:00
avfilter.c avfilter: add some asserts() to check refcounts. 2012-01-22 19:30:40 +01:00
avfilter.h Merge remote-tracking branch 'qatar/master' 2012-01-13 01:29:48 +01:00
avfiltergraph.c
avfiltergraph.h lavfi: add avfilter_graph_dump. 2012-01-24 11:38:36 +01:00
buffersink.h buffersink: Implement a poll function. 2011-12-08 21:19:23 +01:00
buffersrc.h lavfi: add a new function av_buffersrc_buffer(). 2011-12-25 16:18:57 +01:00
defaults.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
drawutils.c
drawutils.h
formats.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
gradfun.h
graphdump.c lavfi: add avfilter_graph_dump. 2012-01-24 11:38:36 +01:00
graphparser.c
internal.h avfilter: pool draining and self destruction support. 2012-01-12 16:32:54 +01:00
libavfilter.v
sink_buffer.c sink_buffer: copy list of provided formats in the context 2011-12-22 10:09:42 +01:00
src_movie.c Merge remote-tracking branch 'qatar/master' 2011-12-26 04:10:47 +01:00
transform.c cleanup: for(int 2011-12-13 21:08:43 +01:00
transform.h
version.h lavfi: add avfilter_graph_dump. 2012-01-24 11:38:36 +01:00
vf_aspect.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
vf_ass.c lavfi: add libass based subtitles renderer 2011-11-26 10:42:33 +01:00
vf_blackframe.c
vf_boxblur.c vf_boxblur: fix memleak 2011-11-25 04:45:41 +01:00
vf_copy.c
vf_crop.c
vf_cropdetect.c
vf_delogo.c
vf_deshake.c deshake: variable used uninitialized 2012-01-21 05:22:49 +01:00
vf_drawbox.c
vf_drawtext.c timecode: set a fixed buffer size of 16B for tc string. 2012-01-11 18:14:03 +01:00
vf_fade.c lavfi: add missing periods in descriptions. 2012-01-20 00:16:27 +01:00
vf_fieldorder.c
vf_fifo.c Fix various if parenthesis misplacements. 2011-11-21 19:35:33 +01:00
vf_format.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
vf_frei0r.c
vf_gradfun.c
vf_hflip.c Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
vf_hqdn3d.c
vf_libopencv.c
vf_lut.c
vf_mp.c lavfi: fix mp and mandelbrot descriptions to make them complete sentences 2012-01-21 14:40:46 +01:00
vf_null.c
vf_overlay.c overlay: do not leak x/y expressions. 2012-01-15 09:12:03 +01:00
vf_pad.c
vf_pixdesctest.c
vf_scale.c vf_scale: give a clue in case of invalid expression self-reference 2011-12-06 15:03:51 +01:00
vf_select.c
vf_setpts.c
vf_settb.c
vf_showinfo.c
vf_slicify.c
vf_split.c
vf_thumbnail.c thumbnail: fix error code in case of invalid args. 2011-12-27 11:15:21 +01:00
vf_tinterlace.c vf_tinterlace: implement interlace mode 5 2012-01-01 16:16:50 +01:00
vf_transpose.c
vf_unsharp.c
vf_vflip.c
vf_yadif.c lavfi: add missing periods in descriptions. 2012-01-20 00:16:27 +01:00
vsink_nullsink.c
vsrc_buffer.c Merge remote-tracking branch 'qatar/master' 2012-01-13 01:29:48 +01:00
vsrc_buffer.h
vsrc_cellauto.c lavfi: add cellauto source 2011-12-11 11:55:33 +01:00
vsrc_color.c lavfi: add missing periods in descriptions. 2012-01-20 00:16:27 +01:00
vsrc_life.c life: add mold, mold_color, life_color and death_color options. 2011-12-11 14:14:01 +01:00
vsrc_mandelbrot.c lavfi: fix mp and mandelbrot descriptions to make them complete sentences 2012-01-21 14:40:46 +01:00
vsrc_mptestsrc.c
vsrc_testsrc.c lavfi/testsrc: add "decimals" option to the testsrc filter 2012-01-17 12:03:30 +01:00
yadif.h