Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 12 Nov 2012 10:32:11 +0000 (11:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 12 Nov 2012 10:32:11 +0000 (11:32 +0100)
commit03b078721c8e42c413da75f553e740d235092dad
treee8efab14cdede3d6a84265c4873ad547ee704bf5
parentda501ea857b13ea13749e372ccca9ae0804ff4d5
parent97bf7c03b1338a867da52c159a2afecbdedcfa88
Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
  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: Michael Niedermayer <michaelni@gmx.at>
81 files changed:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/filters.texi
ffmpeg.c
ffmpeg_filter.c
ffmpeg_opt.c
libavcodec/aacdectab.h
libavcodec/ac3_parser.c
libavcodec/ac3enc.c
libavcodec/ac3tab.c
libavcodec/alac.c
libavcodec/amrnbdec.c
libavcodec/amrwbdec.c
libavcodec/apedec.c
libavcodec/audioconvert.h
libavcodec/bmv.c
libavcodec/cook.c
libavcodec/dcadec.c
libavcodec/dsicinav.c
libavcodec/flac.c
libavcodec/flacdec.c
libavcodec/g722dec.c
libavcodec/g723_1.c
libavcodec/g726.c
libavcodec/gsmdec.c
libavcodec/imc.c
libavcodec/libfaac.c
libavcodec/libfdk-aacenc.c
libavcodec/libgsm.c
libavcodec/libilbc.c
libavcodec/libmp3lame.c
libavcodec/libopencore-amr.c
libavcodec/libspeexdec.c
libavcodec/libspeexenc.c
libavcodec/mlp_parser.c
libavcodec/mpc7.c
libavcodec/mpc8.c
libavcodec/mpegaudiodec.c
libavcodec/mpegaudioenc.c
libavcodec/nellymoserdec.c
libavcodec/pcm-mpeg.c
libavcodec/qcelpdec.c
libavcodec/qdm2.c
libavcodec/ra144dec.c
libavcodec/ra288.c
libavcodec/sipr.c
libavcodec/smacker.c
libavcodec/truespeech.c
libavcodec/twinvq.c
libavcodec/utils.c
libavcodec/vmdav.c
libavcodec/vorbis_data.c
libavcodec/wavpack.c
libavcodec/wmavoice.c
libavcodec/ws-snd1.c
libavdevice/alsa-audio-common.c
libavfilter/af_aformat.c
libavfilter/af_amix.c
libavfilter/af_ashowinfo.c
libavfilter/af_channelmap.c
libavfilter/af_channelsplit.c
libavfilter/af_join.c
libavfilter/asrc_anullsrc.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffer.c
libavfilter/buffersink.c
libavfilter/buffersrc.c
libavfilter/fifo.c
libavformat/aea.c
libavformat/flic.c
libavformat/g723_1.c
libavformat/mov.c
libavformat/mov_chan.c
libavformat/wv.c
libavutil/Makefile
libavutil/channel_layout.c
libavutil/channel_layout.h
libavutil/version.h