Michael Niedermayer c59b80c8d3 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>		2011-12-10 02:01:03 +01:00
..
aiff
alaw
asf
au
avi
bmp
dv_fmt	rematrix: dont use floats for int16 code.	2011-09-19 09:25:50 +02:00
ffm	Merge remote-tracking branch 'qatar/master'	2011-09-07 22:58:39 +02:00
flv_fmt
gif
gxf	gxfenc: support timecode option	2011-12-07 15:29:26 +01:00
jpg
mkv
mmf
mov	Merge remote-tracking branch 'qatar/master'	2011-12-10 02:01:03 +01:00
mpg
mulaw
mxf
mxf_d10	rematrix: dont use floats for int16 code.	2011-09-19 09:25:50 +02:00
nut
ogg	Replace vendor string in Ogg and FLAC muxers.	2011-11-02 10:43:39 +01:00
pbmpipe
pcx
pgm
pgmpipe
pixfmt
png
ppm
ppmpipe
rm
sgi
swf
tga
tiff
ts	Merge remote-tracking branch 'qatar/master'	2011-11-19 02:00:06 +01:00
voc
voc_s16
wav	riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header	2011-10-14 13:28:58 +02:00
yuv4mpeg