Michael Niedermayer
964912aba5
Merge remote-tracking branch 'qatar/master' ...
* qatar/master: (21 commits)
Warn about avserver being broken.
avconv: drop code for special handling of avserver streams.
rawdec: don't set codec timebase.
lavf doxy: add muxing stuff to lavf_encoding group
lavf doxy: add demuxing stuff to lavf_decoding group
lavf doxy: expand/reword metadata API doxy.
lavf doxy: add installed headers to groups.
lavf doxy: add avio groups into the lavf_io group.
lavf doxy: rename lavf I/O group to lavf_io.
lavf doxy: add metadata docs to the main lavf group
ttadec: check channel count as read from extradata.
Add CLJR encoding and decoding regression tests
cljr: remove unused code
flacdec: Support for tracks in cuesheet metadata block
ptx: fix inverted check for sufficient data
flac muxer: fix writing of file header and STREAMINFO header from extradata
ptx: emit a warning on insufficient picture data
utvideo: add fate tests covering all codec variants
doc: update to refer to avconv
doc: remove some stale entries from the faq
...
Conflicts:
Changelog
avconv.c
doc/avconv.texi
doc/faq.texi
doc/ffplay.texi
doc/ffprobe.texi
doc/ffserver.texi
libavcodec/avcodec.h
libavcodec/cljr.c
libavformat/avformat.h
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-11 01:05:33 +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-12-03 03:00:30 +01:00
2011-11-30 20:34:45 +01: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-12-01 02:54:24 +01:00
2011-11-19 02:00:06 +01:00
2011-12-02 00:51:11 +01:00
2011-11-05 16:51:25 +01: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-12-01 02:54:24 +01:00
2011-11-08 10:35:14 +01:00
2011-11-11 02:50:35 +01:00
2011-12-11 01:05:33 +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-12-11 01:05:33 +01:00
2011-11-14 00:33:39 +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-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-12-01 02:54:24 +01: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-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-03 03:24:32 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-03 02:16:26 +01:00
2011-12-01 02:54:24 +01:00
2011-12-11 01:05:33 +01:00
2011-12-11 01:05:33 +01:00
2011-11-02 10:43:39 +01:00
2011-12-01 02:54:24 +01:00
2011-12-10 19:34:28 +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-12-02 00:51:11 +01:00
2011-11-30 20:34:45 +01:00
2011-12-01 02:54:24 +01:00
2011-12-07 15:29:26 +01: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-12-04 16:44:20 +01:00
2011-12-03 05:12:56 +01: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-12-01 02:54:24 +01:00
2011-12-07 03:19:42 +01: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-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-03 03:00:30 +01: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-12-10 02:01:03 +01: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-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-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-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-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-08 18:36:20 +01:00
2011-11-08 23:54:25 +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-10 14:58:57 +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-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-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-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-10 22:02:44 +01:00
2011-11-08 02:03:14 +01:00
2011-12-11 01:05:33 +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-12-01 15:32: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-12-10 19:34:28 +01: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-11-07 03:01:43 +01:00
2011-11-29 00:20:29 +01:00
2011-12-01 02:54:24 +01:00
2011-11-30 17:39:32 +02:00
2011-12-01 02:54:24 +01:00
2011-11-14 00:33:39 +01:00
2011-12-02 00:51:11 +01: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-11-19 02:00:06 +01:00
2011-11-14 00:33:39 +01:00
2011-11-14 00:33:39 +01:00
2011-12-02 00:51:11 +01:00
2011-12-09 00:05:51 +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-01 02:54:24 +01:00
2011-10-30 15:43:19 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01: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-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-11 01:05:33 +01:00
2011-12-01 02:54:24 +01:00
2011-12-10 05:42:18 +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-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
964912aba5