Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 16 May 2012 00:27:31 +0000 (02:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 16 May 2012 00:27:31 +0000 (02:27 +0200)
commit1cbf7fb4345a3e5b7791d483241bf4759bde4ece
treed7acd8317309e051fb240e3505f77aabe2ea0437
parenta48abf5e263ad7f2e68821766e7cf4d29befb58e
parent0ff0af731ce4544f84b2f748dcc699717a2df8d6
Merge remote-tracking branch 'qatar/master'

* qatar/master: (26 commits)
  fate: use diff -b in oneline comparison
  Add missing version bumps and APIchanges/Changelog entries.
  lavfi: move buffer management function to a separate file.
  lavfi: move formats-related functions from default.c to formats.c
  lavfi: move video-related functions to a separate file.
  fate: make smjpeg a demux test
  fate: separate sierra-vmd audio and video tests
  fate: separate smacker audio and video tests
  libmp3lame: set supported channel layouts.
  avconv: automatically insert asyncts when -async is used.
  avconv: add support for audio filters.
  lavfi: add asyncts filter.
  lavfi: add aformat filter
  lavfi: add an audio buffer sink.
  lavfi: add an audio buffer source.
  buffersrc: add av_buffersrc_write_frame().
  buffersrc: fix invalid read in uninit if the fifo hasn't been allocated
  lavfi: rename vsrc_buffer.c to buffersrc.c
  avfiltergraph: reindent
  lavfi: add channel layout/sample rate negotiation.
  ...

Conflicts:
Changelog
doc/APIchanges
doc/filters.texi
ffmpeg.c
ffprobe.c
libavcodec/libmp3lame.c
libavfilter/Makefile
libavfilter/af_aformat.c
libavfilter/allfilters.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
libavfilter/defaults.c
libavfilter/formats.c
libavfilter/src_buffer.c
libavfilter/version.h
libavfilter/vf_yadif.c
libavfilter/vsrc_buffer.c
libavfilter/vsrc_buffer.h
libavutil/avutil.h
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
43 files changed:
Changelog
doc/APIchanges
doc/ffmpeg.texi
doc/filters.texi
ffprobe.c
libavcodec/libmp3lame.c
libavfilter/Makefile
libavfilter/af_aconvert.c
libavfilter/af_aformat.c
libavfilter/af_amerge.c
libavfilter/af_aresample.c
libavfilter/af_astreamsync.c
libavfilter/af_earwax.c
libavfilter/af_pan.c
libavfilter/af_silencedetect.c
libavfilter/af_volume.c
libavfilter/allfilters.c
libavfilter/asrc_aevalsrc.c
libavfilter/avcodec.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffer.c
libavfilter/buffersink.c
libavfilter/buffersink.h
libavfilter/buffersrc.c
libavfilter/buffersrc.h
libavfilter/defaults.c
libavfilter/formats.c
libavfilter/formats.h
libavfilter/internal.h
libavfilter/sink_buffer.c
libavfilter/src_buffer.c
libavfilter/src_movie.c
libavfilter/version.h
libavfilter/vf_yadif.c
libavfilter/video.c
libavutil/avutil.h
tests/fate-run.sh
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/video.mak
tools/lavfi-showfiltfmts.c