-
- Downloads
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>
Showing
- Doxyfile 1 addition, 1 deletionDoxyfile
- doc/Makefile 3 additions, 0 deletionsdoc/Makefile
- doc/avtools-common-opts.texi 4 additions, 4 deletionsdoc/avtools-common-opts.texi
- doc/bitstream_filters.texi 3 additions, 3 deletionsdoc/bitstream_filters.texi
- doc/demuxers.texi 3 additions, 3 deletionsdoc/demuxers.texi
- doc/fate.texi 135 additions, 0 deletionsdoc/fate.texi
- doc/ffserver.texi 2 additions, 2 deletionsdoc/ffserver.texi
- doc/general.texi 65 additions, 384 deletionsdoc/general.texi
- doc/git-howto.texi 344 additions, 0 deletionsdoc/git-howto.texi
- doc/indevs.texi 8 additions, 8 deletionsdoc/indevs.texi
- doc/muxers.texi 13 additions, 13 deletionsdoc/muxers.texi
- doc/platform.texi 387 additions, 0 deletionsdoc/platform.texi
- doc/protocols.texi 6 additions, 6 deletionsdoc/protocols.texi
- doc/t2h.init 86 additions, 0 deletionsdoc/t2h.init
- libavformat/Makefile 3 additions, 2 deletionslibavformat/Makefile
- libavformat/isom.c 43 additions, 58 deletionslibavformat/isom.c
- libavformat/mov.c 48 additions, 2 deletionslibavformat/mov.c
- libavformat/mov_chan.c 505 additions, 0 deletionslibavformat/mov_chan.c
- libavformat/mov_chan.h 55 additions, 0 deletionslibavformat/mov_chan.h
- libavformat/movenc.c 45 additions, 43 deletionslibavformat/movenc.c
Loading
Please register or sign in to comment