mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-01-06 07:10:21 +00:00
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> |
||
|---|---|---|
| .. | ||
| fate | ||
| ref | ||
| audiogen.c | ||
| base64.c | ||
| codec-regression.sh | ||
| copycooker.sh | ||
| fate2.mak | ||
| fate_config.sh.template | ||
| fate-run.sh | ||
| fate-update.sh | ||
| fate.mak | ||
| fate.sh | ||
| ffserver-regression.sh | ||
| ffserver.conf | ||
| ffserver.regression.ref | ||
| lavf-regression.sh | ||
| lavfi-regression.sh | ||
| lena.pnm | ||
| Makefile | ||
| md5.sh | ||
| regression-funcs.sh | ||
| rotozoom.c | ||
| tiny_psnr.c | ||
| videogen.c | ||