Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 10 Dec 2011 00:25:15 +0000 (01:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 10 Dec 2011 01:01:03 +0000 (02:01 +0100)
commitc59b80c8d3e46f176172d582f27c14d772e306fc
tree8457ccf4abee25effcc243b22764b969127493d7
parent5b98ea1b7309fd43694b92e990439636630f408a
parent4c386333529dd773e673e1366d1f6243d2c5af92
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  isom: sort and pretty-print codec_movaudio_tags[]
  isom: remove pointless comments in codec_movaudio_tags[]
  isom: remove commented-out tag for vorbis
  movenc: write 'chan' tag for AC-3 in MOV
  mov: add support for reading and writing the 'chan' tag
  audioconvert: add some additional channel and channel layout macros
  audioconvert: change 7.1 "wide" layout to use side surround channels
  movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs
  doc: update documentation to use avconv
  doc: update demuxers section
  doc: extend external library coverage
  doc: split platform specific information
  doc: port the git-howto to texinfo
  doc: provide fallback css and customize @float
  doc: document fate in a texinfo
  doxy: change hue value to match our green

Conflicts:
doc/fate.txt
doc/ffserver.texi
doc/general.texi
doc/muxers.texi
doc/protocols.texi
doc/t2h.init
libavformat/isom.c
libavformat/mov.c
libavutil/avutil.h
tests/ref/acodec/pcm_s16be
tests/ref/acodec/pcm_s24be
tests/ref/acodec/pcm_s32be
tests/ref/acodec/pcm_s8
tests/ref/lavf/mov

Merged-by: Michael Niedermayer <michaelni@gmx.at>
25 files changed:
Doxyfile
doc/avtools-common-opts.texi
doc/bitstream_filters.texi
doc/demuxers.texi
doc/fate.texi
doc/ffserver.texi
doc/general.texi
doc/git-howto.texi
doc/indevs.texi
doc/muxers.texi
doc/platform.texi
doc/protocols.texi
doc/t2h.init
libavformat/Makefile
libavformat/isom.c
libavformat/mov.c
libavformat/mov_chan.c
libavformat/movenc.c
libavutil/audioconvert.h
libavutil/avutil.h
tests/ref/acodec/pcm_s16be
tests/ref/acodec/pcm_s24be
tests/ref/acodec/pcm_s32be
tests/ref/acodec/pcm_s8
tests/ref/lavf/mov