Michael Niedermayer 43c157f4a4 Merge remote-tracking branch 'qatar/master' ... * qatar/master: af_resample: avoid conversion of identical sample formats for 1 channel avcodec: allow either planar or interleaved sample format when encoding mono adpcmenc: ensure calls to adpcm_ima_compress_sample() are in the right order timefilter: De-doxygenize normal code comments and drop silly ones gxf: Include the right header for the avpriv_frame_rate_tab declaration Conflicts: libavcodec/adpcmenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-10-08 13:11:11 +02:00
..
libmpcodecs	vf_tile: fix typos/grammar in comments	2012-10-06 11:34:10 -05: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	…
avf_showwaves.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
avfilter.c	Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'	2012-09-18 14:45:44 +02:00
avfilter.h	lavfi: drop deprecated and pointless avfilter_default_end_frame() function	2012-09-09 10:57:28 +02:00
avfiltergraph.c	Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'	2012-09-18 14:45:44 +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	…
buffersrc.c	Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'	2012-09-18 14:45:44 +02:00
buffersrc.h	Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'	2012-09-18 14:45:44 +02:00
drawutils.c	…
drawutils.h	…
f_ebur128.c	lavfi: EBU R.128 scanner.	2012-10-01 22:26:19 +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	…
formats.h	…
gradfun.h	Merge remote-tracking branch 'qatar/master'	2012-10-06 13:45:08 +02:00
graphdump.c	…
graphparser.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
internal.h	lavfi/sink_buffer: implement libav compatibility API.	2012-09-27 18:43:37 +02:00
lavfutils.c	…
lavfutils.h	…
libavfilter.v	…
lswsutils.c	…
lswsutils.h	…
sink_buffer.c	lavfi/sink_buffer: implement libav compatibility API.	2012-09-27 18:43:37 +02:00
split.c	Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'	2012-09-18 14:45:44 +02:00
src_buffer.c	…
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	…
vf_alphamerge.c	…
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	…
vf_blackdetect.c	…
vf_blackframe.c	…
vf_boxblur.c	lavfi: drop deprecated and pointless avfilter_default_end_frame() function	2012-09-09 10:57:28 +02:00
vf_colormatrix.c	vf_colormatrix: Drop unused strings.h header	2012-09-07 18:24:43 +02:00
vf_copy.c	…
vf_crop.c	…
vf_cropdetect.c	…
vf_decimate.c	…
vf_delogo.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
vf_deshake.c	…
vf_drawbox.c	…
vf_drawtext.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
vf_edgedetect.c	lavfi/edgedetect: add missing minus in a comment.	2012-10-01 22:31:14 +02:00
vf_fade.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
vf_fieldorder.c	…
vf_format.c	…
vf_fps.c	…
vf_framestep.c	…
vf_frei0r.c	Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'	2012-09-18 14:45:44 +02:00
vf_gradfun.c	…
vf_hflip.c	…
vf_hqdn3d.c	hqdn3d: Fix out of array read in LOWPASS	2012-09-22 03:17:28 +02:00
vf_hue.c	lavfi/hue: simplify/fix setting logic in set_options()	2012-09-23 00:46:33 +02:00
vf_idet.c	vf_idet: Remove emms	2012-09-07 20:08:12 +02:00
vf_libopencv.c	…
vf_lut.c	…
vf_mp.c	lavfi/mp: drop rotate wrapper	2012-09-06 11:27:22 +02:00
vf_null.c	…
vf_overlay.c	Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b'	2012-10-04 13:11:45 +02:00
vf_pad.c	Merge remote-tracking branch 'qatar/master'	2012-10-06 13:45:08 +02:00
vf_pixdesctest.c	…
vf_removelogo.c	…
vf_scale.c	Merge remote-tracking branch 'qatar/master'	2012-10-06 13:45:08 +02:00
vf_select.c	lavfi/select: make lavc dependency optional.	2012-09-20 18:45:47 +02:00
vf_setfield.c	…
vf_showinfo.c	…
vf_slicify.c	…
vf_smartblur.c	…
vf_super2xsai.c	…
vf_swapuv.c	…
vf_thumbnail.c	…
vf_tile.c	…
vf_tinterlace.c	lavfi/tinterlace: declare source buffers in copy_picture_field() as const	2012-09-06 00:40:01 +02:00
vf_transpose.c	lavfi/transpose: add passthrough option	2012-10-02 09:43:06 +02:00
vf_unsharp.c	…
vf_vflip.c	…
vf_yadif.c	Merge remote-tracking branch 'qatar/master'	2012-09-10 14:06:20 +02:00
video.c	lavfi: check that buffer and link properties match.	2012-09-13 20:09:53 +02:00
video.h	…
vsink_nullsink.c	Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'	2012-09-18 14:45:44 +02:00
vsrc_cellauto.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
vsrc_life.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
vsrc_mandelbrot.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
vsrc_mptestsrc.c	Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'	2012-09-05 14:33:32 +02:00
vsrc_testsrc.c	vsrc_testsrc: Fix case without a specified duration	2012-09-21 03:00:15 +02:00
yadif.h	Merge remote-tracking branch 'qatar/master'	2012-10-06 13:45:08 +02:00