• Michael Niedermayer's avatar
    Merge commit '97bf7c03' · 03b07872
    Michael Niedermayer authored
    * commit '97bf7c03':
      doc: git-howto: Leave reviewers time to react before pushing patches
      Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
      lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h
    
    Conflicts:
    	doc/APIchanges
    	doc/examples/decoding_encoding.c
    	doc/git-howto.texi
    	ffmpeg_filter.c
    	libavcodec/flacdec.c
    	libavcodec/imc.c
    	libavcodec/mpegaudiodec.c
    	libavcodec/utils.c
    	libavfilter/asrc_anullsrc.c
    	libavfilter/audio.c
    	libavfilter/avfilter.c
    	libavfilter/avfilter.h
    	libavfilter/avfiltergraph.c
    	libavfilter/buffer.c
    	libavutil/Makefile
    	libavutil/audioconvert.h
    	libavutil/channel_layout.c
    	libavutil/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    03b07872
libmp3lame.c 10.1 KB