• 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
Name
Last commit
Last update
..
Makefile Loading commit data...
alldevices.c Loading commit data...
alsa-audio-common.c Loading commit data...
alsa-audio-dec.c Loading commit data...
alsa-audio-enc.c Loading commit data...
alsa-audio.h Loading commit data...
avdevice.c Loading commit data...
avdevice.h Loading commit data...
bktr.c Loading commit data...
caca.c Loading commit data...
dshow.c Loading commit data...
dshow_capture.h Loading commit data...
dshow_common.c Loading commit data...
dshow_enummediatypes.c Loading commit data...
dshow_enumpins.c Loading commit data...
dshow_filter.c Loading commit data...
dshow_pin.c Loading commit data...
dv1394.c Loading commit data...
dv1394.h Loading commit data...
fbdev.c Loading commit data...
iec61883.c Loading commit data...
jack_audio.c Loading commit data...
lavfi.c Loading commit data...
libavdevice.v Loading commit data...
libcdio.c Loading commit data...
libdc1394.c Loading commit data...
openal-dec.c Loading commit data...
oss_audio.c Loading commit data...
pulse.c Loading commit data...
sdl.c Loading commit data...
sndio_common.c Loading commit data...
sndio_common.h Loading commit data...
sndio_dec.c Loading commit data...
sndio_enc.c Loading commit data...
timefilter.c Loading commit data...
timefilter.h Loading commit data...
v4l.c Loading commit data...
v4l2.c Loading commit data...
version.h Loading commit data...
vfwcap.c Loading commit data...
x11grab.c Loading commit data...