• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 1cbf7fb4
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    1cbf7fb4
Changelog 32.6 KB