mirror of https://git.ffmpeg.org/ffmpeg.git
c59b80c8d3
* 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> |
||
|---|---|---|
| .. | ||
| ac3_fixed | ||
| adpcm_ima_qt | ||
| adpcm_ima_wav | ||
| adpcm_ms | ||
| adpcm_swf | ||
| adpcm_yam | ||
| alac | ||
| aref | ||
| flac | ||
| g722 | ||
| g723_1 | ||
| g726 | ||
| mp2 | ||
| pcm_alaw | ||
| pcm_f32be | ||
| pcm_f32le | ||
| pcm_f64be | ||
| pcm_f64le | ||
| pcm_mulaw | ||
| pcm_s8 | ||
| pcm_s16be | ||
| pcm_s16le | ||
| pcm_s24be | ||
| pcm_s24daud | ||
| pcm_s24le | ||
| pcm_s32be | ||
| pcm_s32le | ||
| pcm_u8 | ||
| wmav1 | ||
| wmav2 | ||