Michael Niedermayer 0f1446a4d0 Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b' ... * commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b': vf_overlay: get rid of pointless messing with timebase. samplefmt: make av_samples_alloc() initialize the data to silence. libspeexdec: handle NULL return value from speex_packet_to_header() h264probe: Don't error out on bits that no longer are reserved mpegvideo: set extended_data in ff_update_duplicate_context() libspeexdec: properly handle DTX for multiple frames-per-packet libspeexdec: move the SpeexHeader from LibSpeexContext to where it is used libspeexdec: simplify setting of frame_size libspeexdec: set channel_layout Conflicts: libavfilter/vf_overlay.c libavformat/h264dec.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-10-04 13:11:45 +02:00
..
libmpcodecs
x86
af_aconvert.c
af_aformat.c
af_amerge.c
af_amix.c
af_anull.c
af_aresample.c
af_asetnsamples.c
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
af_volumedetect.c
all_channel_layouts.inc
allfilters.c
asink_anullsink.c
asrc_abuffer.h
asrc_aevalsrc.c
asrc_anullsrc.c
asrc_flite.c
audio.c
audio.h
avcodec.c
avcodec.h
avf_concat.c
avf_showspectrum.c
avf_showwaves.c
avfilter.c
avfilter.h
avfiltergraph.c
avfiltergraph.h
bbox.c
bbox.h
buffer.c
bufferqueue.h
buffersink.c
buffersink.h
buffersrc.c
buffersrc.h
drawutils.c
drawutils.h
f_ebur128.c
f_sendcmd.c
f_setpts.c
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
sink_buffer.c
split.c
src_buffer.c
src_movie.c
transform.c
transform.h
version.h
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_decimate.c
vf_delogo.c
vf_deshake.c
vf_drawbox.c
vf_drawtext.c
vf_edgedetect.c
vf_fade.c
vf_fieldorder.c
vf_format.c
vf_fps.c
vf_framestep.c
vf_frei0r.c
vf_gradfun.c
vf_hflip.c
vf_hqdn3d.c
vf_hue.c
vf_idet.c
vf_libopencv.c
vf_lut.c
vf_mp.c
vf_null.c
vf_overlay.c	Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b'	2012-10-04 13:11:45 +02:00
vf_pad.c
vf_pixdesctest.c
vf_removelogo.c
vf_scale.c
vf_select.c
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
vf_transpose.c
vf_unsharp.c
vf_vflip.c
vf_yadif.c
video.c
video.h
vsink_nullsink.c
vsrc_cellauto.c
vsrc_life.c
vsrc_mandelbrot.c
vsrc_mptestsrc.c
vsrc_testsrc.c
yadif.h