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
2011-12-01 02:54:24 +01:00
2011-11-29 00:20:29 +01:00
2011-12-01 02:54:24 +01:00
2011-11-30 18:08:23 +01:00
2011-12-03 03:24:32 +01:00
2011-03-19 13:33:20 +00:00
2011-12-03 03:00:30 +01:00
2011-11-30 20:34:45 +01:00
2011-10-20 02:34:51 +02:00
2011-11-12 02:50:25 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-04 16:44:20 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-10-20 02:34:51 +02:00
2011-12-01 02:54:24 +01:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-11-19 02:00:06 +01:00
2011-12-02 00:51:11 +01:00
2011-03-19 13:33:20 +00:00
2011-11-05 16:51:25 +01:00
2011-06-24 03:07:04 +02:00
2011-03-19 13:33:20 +00:00
2011-12-03 03:00:30 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-03-19 13:33:20 +00:00
2011-12-01 02:54:24 +01:00
2011-11-08 10:35:14 +01:00
2011-03-19 13:33:20 +00:00
2011-11-11 02:50:35 +01:00
2011-03-19 13:33:20 +00:00
2011-12-06 01:37:27 +01:00
2011-11-28 01:07:11 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-14 00:33:39 +01:00
2011-11-24 15:03:27 +01:00
2011-11-19 02:00:06 +01:00
2011-11-14 00:33:39 +01:00
2011-12-01 02:54:24 +01:00
2011-09-08 22:37:31 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-03 03:24:32 +01:00
2011-12-03 03:24:32 +01:00
2011-11-30 20:34:45 +01:00
2011-12-01 02:54:24 +01:00
2011-12-02 00:51:11 +01:00
2011-08-01 00:58:49 +02:00
2011-04-28 10:45:32 +02:00
2011-12-01 02:54:24 +01:00
2011-08-22 09:35:58 +02:00
2011-05-27 23:48:22 +02:00
2011-12-01 02:54:24 +01:00
2011-12-02 00:51:11 +01:00
2011-11-24 03:32:24 +01:00
2011-11-13 13:14:39 +01:00
2011-11-03 02:16:26 +01:00
2011-10-20 02:34:51 +02:00
2011-12-01 02:54:24 +01:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-12-01 02:54:24 +01:00
2011-07-17 20:12:02 +02:00
2011-12-01 02:54:24 +01:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-03 03:24:32 +01:00
2011-08-09 19:56:25 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-05-22 04:53:19 +02:00
2011-10-21 02:01:26 +02:00
2011-06-09 04:47:19 +02:00
2011-11-03 02:16:26 +01:00
2011-12-01 02:54:24 +01:00
2011-07-17 20:12:02 +02:00
2011-12-01 02:54:24 +01:00
2011-10-21 02:01:26 +02:00
2011-11-02 10:43:39 +01:00
2011-03-19 13:33:20 +00:00
2011-12-01 02:54:24 +01:00
2011-09-07 02:36:42 +02:00
2011-12-03 21:39:53 +01:00
2011-12-01 02:54:24 +01:00
2011-11-24 03:32:24 +01:00
2011-12-03 03:24:32 +01:00
2011-12-03 03:24:32 +01:00
2011-10-13 06:00:03 +02:00
2011-12-02 00:51:11 +01:00
2011-11-30 20:34:45 +01:00
2011-12-01 02:54:24 +01:00
2011-03-19 13:33:20 +00:00
2011-12-07 15:29:26 +01:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-12-02 00:51:11 +01:00
2011-11-11 02:50:35 +01:00
2011-11-12 02:50:25 +01:00
2011-03-19 13:33:20 +00:00
2011-12-04 16:44:20 +01:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-12-03 05:12:56 +01:00
2011-10-24 01:01:21 +02:00
2011-11-03 20:21:01 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-09-24 22:39:52 +02:00
2011-12-01 02:54:24 +01:00
2011-12-07 03:19:42 +01:00
2011-09-17 22:36:43 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-10 02:01:03 +01:00
2011-10-29 02:08:54 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-03-19 13:33:20 +00:00
2011-12-01 02:54:24 +01:00
2011-12-03 03:00:30 +01:00
2011-10-28 21:46:30 +02:00
2011-12-03 03:24:32 +01:00
2011-12-08 21:21:34 +01:00
2011-12-02 00:51:11 +01:00
2011-12-01 02:54:24 +01:00
2011-12-03 03:24:32 +01:00
2011-12-01 02:54:24 +01:00
2011-05-27 23:48:22 +02:00
2011-12-10 02:01:03 +01:00
2011-05-24 23:34:24 +02:00
2011-05-29 03:34:35 +02:00
2011-12-06 01:37:27 +01:00
2011-12-03 03:00:30 +01:00
2011-11-24 03:32:24 +01:00
2011-12-02 00:51:11 +01:00
2011-11-06 11:52:57 +02:00
2011-06-09 04:47:19 +02:00
2011-12-03 03:24:32 +01:00
2011-04-04 01:29:40 +02:00
2011-12-03 03:24:32 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-04-20 04:48:23 +02:00
2011-05-22 04:53:19 +02:00
2011-12-02 00:51:11 +01:00
2011-12-02 00:51:11 +01:00
2011-12-10 02:01:03 +01:00
2011-12-09 16:12:58 -05:00
2011-12-10 02:01:03 +01:00
2011-12-10 02:01:03 +01:00
2011-12-06 16:28:36 +01:00
2011-07-11 04:23:25 +02:00
2011-12-01 02:54:24 +01:00
2011-11-14 20:59:28 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-29 00:20:29 +01:00
2011-03-19 13:33:20 +00:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-10-29 02:08:54 +02:00
2011-12-08 18:36:20 +01:00
2011-11-08 23:54:25 +01:00
2011-08-09 19:56:25 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-09-27 22:27:52 +02:00
2011-03-19 13:33:20 +00:00
2011-12-08 20:28:49 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-08 02:03:14 +01:00
2011-11-08 02:03:14 +01:00
2011-12-01 02:54:24 +01:00
2011-12-03 03:00:30 +01:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-06 01:37:27 +01:00
2011-12-06 01:37:27 +01:00
2011-09-26 13:51:29 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-30 20:34:45 +01:00
2011-12-01 02:54:24 +01:00
2011-11-30 20:34:45 +01:00
2011-11-30 20:34:45 +01:00
2011-11-30 20:34:45 +01:00
2011-12-05 00:11:57 +01:00
2011-12-01 03:53:13 +01:00
2011-11-07 03:01:43 +01:00
2011-11-03 02:16:26 +01:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-10-13 06:00:03 +02:00
2011-09-24 22:39:52 +02:00
2011-12-03 03:24:32 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-09-17 22:36:43 +02:00
2011-10-13 16:50:20 +02:00
2011-03-19 13:33:20 +00:00
2011-10-13 06:00:03 +02:00
2011-11-08 02:03:14 +01:00
2011-07-14 20:44:58 +02:00
2011-12-09 00:05:51 +01:00
2011-11-28 01:07:11 +01:00
2011-12-01 02:54:24 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-12-01 02:54:24 +01:00
2011-07-17 20:12:02 +02:00
2011-12-01 15:32:20 +00:00
2011-03-19 13:33:20 +00:00
2011-11-03 02:16:26 +01:00
2011-12-01 02:54:24 +01:00
2011-11-29 00:20:29 +01:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +02:00
2011-07-03 03:14:10 +02:00
2011-12-08 00:23:37 +01:00
2011-10-18 01:54:40 +02:00
2011-09-27 02:14:37 +02:00
2011-04-24 03:41:22 +02:00
2011-12-01 02:54:24 +01:00
2011-11-30 17:39:32 +02:00
2011-12-02 00:51:11 +01:00
2011-03-19 13:33:20 +00:00
2011-04-24 03:41:22 +02:00
2011-11-07 03:01:43 +01:00
2011-11-29 00:20:29 +01:00
2011-04-24 03:41:22 +02:00
2011-05-13 04:40:40 +02:00
2011-12-01 02:54:24 +01:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-04-24 03:41:22 +02:00
2011-11-30 17:39:32 +02:00
2011-12-01 02:54:24 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-11-14 00:33:39 +01:00
2011-04-09 03:17:07 +02:00
2011-03-19 13:33:20 +00:00
2011-06-15 20:21:33 +02:00
2011-06-17 05:49:58 +02:00
2011-10-21 02:01:26 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-12-02 00:51:11 +01:00
2011-10-13 06:00:03 +02:00
2011-12-02 00:51:11 +01:00
2011-12-03 03:00:30 +01:00
2011-11-03 02:16:26 +01:00
2011-03-19 13:33:20 +00:00
2011-11-19 02:00:06 +01:00
2011-10-18 01:54:40 +02:00
2011-11-14 00:33:39 +01:00
2011-11-14 00:33:39 +01:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-12-02 00:51:11 +01:00
2011-12-09 00:05:51 +01:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-12-01 02:54:24 +01:00
2011-10-17 16:51:48 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-03-19 13:33:20 +00:00
2011-12-01 02:54:24 +01:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-05-22 04:53:19 +02:00
2011-10-21 02:01:26 +02:00
2011-10-30 15:43:19 +02:00
2011-12-01 02:54:24 +01:00
2011-03-19 13:33:20 +00:00
2011-12-01 02:54:24 +01:00
2011-07-17 20:12:02 +02:00
2011-12-02 00:51:11 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-28 10:01:50 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-10-20 02:34:51 +02:00
2011-12-02 00:51:11 +01:00
2011-11-14 00:33:39 +01:00
2011-12-08 13:04:02 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 03:53:13 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-12-01 02:54:24 +01:00
2011-12-08 19:00:55 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-30 20:34:45 +01:00
2011-09-08 01:55:07 +02:00
2011-12-03 03:24:32 +01:00
2011-12-03 03:24:32 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-05 00:11:57 +01:00
c59b80c8d3