Michael Niedermayer 7427d1ca4a Merge remote-tracking branch 'qatar/master' ... * qatar/master: g723.1: simplify scale_vector() g723.1: simplify normalize_bits() vda: cosmetics: fix Doxygen comment formatting vda: better frame allocation vda: Merge implementation into one file vda: support synchronous decoding vda: Reuse the bitstream buffer and reallocate it only if needed build: Factor out mpegvideo encoding dependencies to CONFIG_MPEGVIDEOENC avprobe: Include libm.h for the log2 fallback proresenc: use the edge emulation buffer rtmp: handle bytes read reports configure: Fix typo in mpeg2video/svq1 decoder dependency declaration Use log2(x) instead of log(x) / log(2) x86: swscale: fix fragile memory accesses x86: swscale: remove disabled code x86: yadif: fix asm with suncc x86: cabac: allow building with suncc x86: mlpdsp: avoid taking address of void ARM: intmath: use native-size return types for clipping functions Conflicts: configure ffprobe.c libavcodec/Makefile libavcodec/g723_1.c libavcodec/v210dec.h libavcodec/vda.h libavcodec/vda_h264.c libavcodec/x86/cabac.h libavfilter/x86/yadif_template.c libswscale/x86/rgb2rgb_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-08-14 15:34:39 +02:00
..
libmpcodecs
x86	Merge remote-tracking branch 'qatar/master'	2012-08-14 15:34:39 +02:00
af_aconvert.c
af_aformat.c
af_amerge.c
af_amix.c
af_anull.c
af_aresample.c
af_asetnsamples.c	lavfi/asetnsamples: push as many frames as ready	2012-08-14 13:19:52 +02:00
af_ashowinfo.c
af_astreamsync.c
af_asyncts.c
af_atempo.c
af_channelmap.c
af_channelsplit.c
af_earwax.c
af_join.c
af_pan.c
af_resample.c
af_silencedetect.c
af_volume.c
all_channel_layouts.inc
allfilters.c	lavfi: add hue filter	2012-08-13 12:00:54 +02:00
asink_anullsink.c
asrc_abuffer.h
asrc_aevalsrc.c
asrc_anullsrc.c
asrc_flite.c
audio.c	lavfi: use min_perms and rej_perms for out pads.	2012-08-14 12:00:35 +02:00
audio.h
avcodec.c
avcodec.h
avf_concat.c
avf_showwaves.c
avfilter.c	lavfi: add avfilter_get_class() and iteration callbacks	2012-08-13 00:04:06 +02:00
avfilter.h	lavfi: use min_perms and rej_perms for out pads.	2012-08-14 12:00:35 +02:00
avfiltergraph.c
avfiltergraph.h
bbox.c
bbox.h
buffer.c
bufferqueue.h
buffersink.c
buffersink.h	Merge remote-tracking branch 'qatar/master'	2012-08-10 16:25:23 +02:00
buffersrc.c
buffersrc.h
drawutils.c
drawutils.h
f_settb.c
fifo.c
filtfmts.c
formats.c
formats.h
gradfun.h
graphdump.c
graphparser.c
internal.h
lavfutils.c
lavfutils.h
libavfilter.v
lswsutils.c
lswsutils.h
Makefile	lavfi: add hue filter	2012-08-13 12:00:54 +02:00
sink_buffer.c
split.c
src_buffer.c
src_movie.c
transform.c
transform.h
version.h	lavfi: add hue filter	2012-08-13 12:00:54 +02:00
vf_alphaextract.c
vf_alphamerge.c
vf_aspect.c
vf_ass.c
vf_bbox.c
vf_blackdetect.c
vf_blackframe.c
vf_boxblur.c
vf_colormatrix.c
vf_copy.c
vf_crop.c
vf_cropdetect.c
vf_delogo.c
vf_deshake.c
vf_drawbox.c
vf_drawtext.c
vf_fade.c
vf_fieldorder.c
vf_format.c
vf_fps.c
vf_frei0r.c
vf_gradfun.c
vf_hflip.c
vf_hqdn3d.c
vf_hue.c	lavfi: add hue filter	2012-08-13 12:00:54 +02:00
vf_idet.c
vf_libopencv.c
vf_lut.c
vf_mp.c
vf_null.c
vf_overlay.c
vf_pad.c
vf_pixdesctest.c
vf_removelogo.c
vf_scale.c
vf_select.c
vf_setfield.c
vf_setpts.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	yadif: check input video size.	2012-08-10 00:09:34 +02:00
video.c	lavfi: use min_perms and rej_perms for out pads.	2012-08-14 12:00:35 +02:00
video.h
vsink_nullsink.c
vsrc_cellauto.c
vsrc_life.c
vsrc_mandelbrot.c
vsrc_mptestsrc.c
vsrc_testsrc.c
yadif.h	yadif: redesign first and last 2 lines handling.	2012-08-10 00:08:34 +02:00