Michael Niedermayer
0ebd83617f
Merge remote-tracking branch 'qatar/master' ...
* qatar/master: (27 commits)
avconv: free packet in write_frame() when discarding due to frame number limit
FATE: use +/- flag option syntax for vp8 emu-edge tests
lavf: make av_interleave_packet_per_dts() private.
lavf: deprecate av_read_packet().
oggdec: output correct timestamps for Vorbis
avconv: pass input stream timestamps to audio encoders
lavc: shrink encoded audio packet size after encoding.
xa: set correct bit rate
xa: do not set bit_rate, block_align, or bits_per_coded_sample
xa: fix end-of-file handling
xa: fix timestamp calculation
bink: fix typo in FFALIGN() argument
bink: align plane width to 8 when calculating bundle sizes
doc: pass -Idoc texi2html and texi2pod
doc: texi2pod: add -I flag
movenc: Add a min_frag_duration option
rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers
libavformat: Set the default for the max_delay option to -1
Generate manpages for AV{Format,Codec}Context AVOptions.
doc/avconv: remove entries for AVOptions.
...
Conflicts:
doc/Makefile
doc/ffmpeg.texi
doc/muxers.texi
ffmpeg.c
libavcodec/Makefile
libavcodec/options.c
libavcodec/vp8.c
libavformat/options.c
tests/fate/demux.mak
tests/ref/fate/truemotion1-15
tests/ref/fate/truemotion1-24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-21 01:33:53 +01:00
2012-02-06 20:33:06 +01:00
2011-11-29 00:20:29 +01:00
2012-02-01 02:36:09 +01:00
2012-02-01 02:36:09 +01:00
2012-01-28 07:53:34 +01:00
2011-03-19 13:33:20 +00:00
2011-12-03 03:00:30 +01:00
2012-01-31 07:50:31 +01:00
2012-02-16 01:34:37 +01:00
2011-11-12 02:50:25 +01:00
2012-03-06 06:03:32 +01:00
2011-12-12 01:25:37 +01:00
2012-03-03 04:30:49 +01:00
2012-03-06 06:03:32 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-03-06 06:03:32 +01:00
2012-02-25 04:00:43 +01:00
2012-02-10 01:20:07 +01:00
2011-12-31 22:33:58 +01: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
2012-03-01 03:17:11 +01:00
2011-12-01 02:54:24 +01:00
2012-01-28 07:53:34 +01:00
2011-03-19 13:33:20 +00:00
2012-02-16 01:34:37 +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
2012-03-21 01:33:53 +01:00
2011-11-28 01:07:11 +01:00
2012-03-21 01:33:53 +01:00
2011-12-13 20:01:49 +01:00
2011-12-19 11:57:34 +01:00
2012-02-06 02:04:08 +01:00
2012-03-13 01:14:04 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2011-09-08 22:37:31 +02:00
2011-03-19 13:33:20 +00:00
2012-03-03 00:23:10 +01:00
2012-02-17 00:35:06 +01:00
2012-01-28 07:53:34 +01:00
2012-02-10 15:27:49 -05:00
2012-01-29 18:11:39 +01:00
2012-01-28 07:53:34 +01:00
2012-03-03 04:30:49 +01:00
2012-01-27 10:51:57 +01:00
2012-02-16 01:34:37 +01:00
2012-02-06 02:04:09 +01:00
2011-08-01 00:58:49 +02:00
2011-04-28 10:45:32 +02:00
2012-02-11 01:22:22 +01:00
2012-01-23 17:18:13 +01:00
2011-05-27 23:48:22 +02:00
2012-01-28 07:53:34 +01:00
2012-03-05 16:27:31 -05:00
2011-12-02 00:51:11 +01:00
2011-12-30 20:00:53 +01:00
2011-11-13 13:14:39 +01:00
2012-02-16 01:34:37 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2012-01-28 07:53:34 +01:00
2012-02-01 02:36:09 +01:00
2012-03-10 10:43:14 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-03-01 03:17:11 +01:00
2012-01-28 07:53:34 +01:00
2012-03-04 04:26:04 +01:00
2011-08-09 19:56:25 +02:00
2012-03-01 03:17:11 +01:00
2012-03-01 03:17:11 +01:00
2011-05-22 04:53:19 +02:00
2012-01-28 07:53:34 +01:00
2011-06-09 04:47:19 +02:00
2011-11-03 02:16:26 +01:00
2012-02-10 15:27:49 -05:00
2011-07-17 20:12:02 +02:00
2012-02-01 02:36:09 +01:00
2011-12-11 01:05:33 +01:00
2011-11-02 10:43:39 +01:00
2011-03-19 13:33:20 +00:00
2012-01-28 07:53:34 +01:00
2012-03-20 07:53:40 +01:00
2012-03-20 07:53:40 +01:00
2012-03-12 20:42:25 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-22 02:24:18 +01:00
2012-01-06 02:45:12 +01:00
2012-01-31 07:50:31 +01:00
2012-03-19 13:33:24 +01:00
2011-03-19 13:33:20 +00:00
2012-03-21 01:33:53 +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
2012-02-21 05:10:12 +01:00
2012-02-15 01:52:14 +01:00
2012-03-14 02:10:11 +01:00
2011-11-11 02:50:35 +01:00
2012-03-14 02:10:11 +01:00
2012-03-14 02:10:11 +01:00
2012-01-28 07:53:34 +01:00
2011-06-09 04:47:19 +02:00
2012-01-29 00:34:59 +01:00
2012-03-21 01:33:53 +01:00
2012-03-01 03:17:11 +01:00
2012-03-01 03:17:11 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2011-09-24 22:39:52 +02:00
2012-03-13 01:56:33 +01:00
2012-03-18 23:39:42 +01:00
2012-02-23 04:31:55 +01:00
2012-03-18 23:39:42 +01:00
2012-02-01 02:36:09 +01:00
2012-03-21 01:33:53 +01:00
2012-01-28 07:53:34 +01:00
2012-02-23 04:31:55 +01:00
2012-02-23 04:31:55 +01:00
2012-01-29 00:34:59 +01:00
2012-02-01 02:36:09 +01:00
2012-01-28 07:53:34 +01:00
2011-03-19 13:33:20 +00:00
2012-03-15 01:27:10 +01:00
2011-12-03 03:00:30 +01:00
2012-03-12 06:04:37 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-15 01:52:14 +01:00
2012-01-28 07:53:34 +01:00
2012-02-01 02:36:09 +01:00
2012-01-29 00:34:59 +01:00
2011-05-27 23:48:22 +02:00
2012-03-03 04:30:49 +01:00
2011-05-24 23:34:24 +02:00
2012-03-01 03:17:11 +01:00
2012-03-16 05:28:18 +01:00
2012-03-14 21:51:38 +01:00
2012-02-04 02:34:14 +01:00
2011-12-02 00:51:11 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2011-04-04 01:29:40 +02:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-03-19 10:09:04 +01:00
2011-04-20 04:48:23 +02:00
2011-12-12 01:25:37 +01:00
2012-01-06 02:45:12 +01:00
2012-01-06 02:45:12 +01:00
2012-01-05 10:34:06 -08:00
2012-02-28 20:48:43 +01:00
2012-03-08 21:31:45 +01:00
2012-03-21 01:33:53 +01:00
2012-03-21 01:33:53 +01:00
2012-02-17 00:35:06 +01:00
2012-03-19 20:49:04 +01:00
2012-03-01 03:17:11 +01:00
2012-02-10 15:27:49 -05:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2011-03-19 13:33:20 +00:00
2012-03-21 01:33:53 +01:00
2012-03-10 01:12:08 +01:00
2012-02-29 00:30:35 +01:00
2012-03-21 01:33:53 +01:00
2012-03-09 22:25:32 +01:00
2012-03-10 18:32:02 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-03-10 18:01:03 +01:00
2012-03-11 17:39:52 +01:00
2012-03-20 13:45:19 +01:00
2012-02-02 14:31:17 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 00:34:59 +01:00
2012-02-03 19:51:13 +01:00
2012-02-14 01:53:31 +01:00
2011-12-03 03:00:30 +01:00
2012-02-09 23:25:46 +01:00
2011-03-19 13:33:20 +00:00
2012-01-28 07:53:34 +01:00
2011-12-01 02:54:24 +01:00
2012-03-13 01:14:04 +01:00
2012-03-09 01:22:31 +01:00
2011-09-26 13:51:29 +02:00
2012-02-25 04:00:43 +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
2012-03-08 21:31:45 +01:00
2012-02-04 20:18:31 +01:00
2011-11-30 20:34:45 +01:00
2012-03-02 11:11:38 +01:00
2012-03-20 14:39:57 -04:00
2011-12-19 02:34:18 +01:00
2011-12-20 22:38:53 +01:00
2012-03-18 15:01:58 -07:00
2012-02-29 14:26:14 +01:00
2012-03-21 01:33:53 +01:00
2012-03-21 01:33:53 +01:00
2012-02-18 12:26:35 +01:00
2012-02-03 19:51:13 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2011-09-24 22:39:52 +02:00
2012-02-28 07:20:36 +01:00
2012-03-04 04:26:04 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2011-03-19 13:33:20 +00:00
2012-03-10 01:12:08 +01:00
2012-02-26 07:30:21 +01:00
2012-02-01 02:36:09 +01:00
2012-01-05 02:03:12 +01:00
2011-03-19 13:33:20 +00:00
2012-02-01 02:36:09 +01:00
2012-03-06 06:03:32 +01:00
2011-07-14 20:44:58 +02:00
2012-03-19 19:02:23 +01:00
2011-11-28 01:07:11 +01:00
2012-02-29 00:30:35 +01:00
2012-03-20 00:03:19 +01:00
2011-03-19 13:33:20 +00:00
2012-03-20 00:03:19 +01:00
2012-01-03 03:06:45 +01:00
2012-01-28 07:53:34 +01:00
2011-03-19 13:33:20 +00:00
2011-11-03 02:16:26 +01:00
2012-02-16 01:34:37 +01:00
2011-11-29 00:20:29 +01:00
2011-03-19 13:33:20 +00:00
2011-12-12 01:25:37 +01:00
2011-07-03 03:14:10 +02:00
2012-01-06 02:45:12 +01:00
2012-02-24 02:57:18 +01:00
2012-02-17 00:35:06 +01:00
2012-01-29 00:34:59 +01:00
2012-03-21 01:33:53 +01:00
2012-02-19 01:47:10 +01:00
2011-12-02 00:51:11 +01:00
2012-02-18 17:31:55 +02:00
2012-02-19 01:47:10 +01:00
2012-02-14 01:53:31 +01:00
2012-02-07 01:40:29 +01:00
2012-02-07 01:40:29 +01:00
2012-02-07 01:40:29 +01:00
2011-12-13 00:39:48 +01: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
2012-03-04 04:26:04 +01:00
2011-12-01 02:54:24 +01:00
2011-03-19 13:33:20 +00:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2011-04-09 03:17:07 +02:00
2012-03-01 16:08:32 +02:00
2012-02-24 02:57:18 +01:00
2011-12-12 01:25:37 +01:00
2011-06-17 05:49:58 +02:00
2012-01-29 00:34:59 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2012-03-21 01:33:53 +01:00
2012-03-20 00:03:19 +01:00
2012-02-17 00:35:06 +01:00
2012-03-21 01:33:53 +01:00
2012-01-23 01:05:20 +01:00
2011-03-19 13:33:20 +00:00
2012-03-20 00:03:19 +01:00
2012-03-20 00:03:19 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2012-02-23 16:00:22 +01:00
2012-02-24 02:57:18 +01:00
2011-12-13 00:39:48 +01:00
2012-03-06 06:03:32 +01:00
2012-03-06 06:03:32 +01:00
2012-03-04 04:26:04 +01:00
2012-02-28 15:01:20 +01:00
2012-01-28 07:53:34 +01:00
2012-03-06 06:03:32 +01:00
2012-03-08 02:51:45 +01:00
2012-01-17 02:37:30 +01:00
2012-01-16 11:29:55 +01:00
2012-02-14 10:12:44 +01:00
2012-01-16 11:29:55 +01:00
2012-02-16 01:34:37 +01:00
2011-03-19 13:33:20 +00:00
2012-02-16 01:34:37 +01:00
2011-12-12 01:25:37 +01:00
2011-03-19 13:33:20 +00:00
2011-05-22 04:53:19 +02:00
2012-01-28 07:53:34 +01:00
2012-01-05 16:27:07 -08:00
2012-01-28 07:53:34 +01:00
2011-03-19 13:33:20 +00:00
2012-03-01 03:17:11 +01:00
2012-03-06 06:03:32 +01:00
2012-01-06 02:45:12 +01:00
2012-03-04 04:26:04 +01:00
2012-03-04 04:26:04 +01:00
2012-01-05 23:56:52 +02:00
2012-02-10 15:27:49 -05:00
2012-03-04 04:26:04 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-03-17 14:43:37 +01:00
2012-03-20 00:03:19 +01:00
2012-03-21 01:33:53 +01:00
2012-01-28 07:53:34 +01:00
2011-12-30 20:00:53 +01:00
2012-03-21 01:33:53 +01:00
2011-03-19 13:33:20 +00:00
2012-02-16 01:34:37 +01:00
2012-03-04 04:26:04 +01:00
2011-07-17 20:12:02 +02:00
2011-06-09 04:47:19 +02:00
2011-12-13 00:39:48 +01:00
2012-03-04 04:26:04 +01:00
2012-02-16 01:34:37 +01:00
2012-01-28 07:53:34 +01:00
2012-02-01 04:43:06 +01:00
2012-01-28 07:53:34 +01:00
2012-01-27 10:51:57 +01:00
2011-09-08 01:55:07 +02:00
2012-01-28 07:53:34 +01:00
2011-12-03 03:24:32 +01:00
2012-02-10 01:20:07 +01:00
2012-03-21 01:33:53 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-10 15:27:50 -05:00
2012-01-31 02:46:26 +01:00
0ebd83617f