Michael Niedermayer
d2084402e6
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
lavc: fix type for thread_type option
avconv: move format to options context
avconv: move limit_filesize to options context
avconv: move start_time, recording_time and input_ts_offset to options context
avconv: add a context for options.
cmdutils: allow storing per-stream/chapter/.... options in a generic way
cmdutils: split per-option code out of parse_options().
cmdutils: add support for caller-provided option context.
cmdutils: declare only one pointer type in OptionDef
cmdutils: move grow_array() from avconv to cmdutils.
cmdutils: move exit_program() declaration to cmdutils from avconv
http: Consider the stream as seekable if the reply contains Accept-Ranges: bytes
nutenc: add namespace to the api facing functions
Conflicts:
avconv.c
cmdutils.c
cmdutils.h
ffmpeg.c
ffplay.c
ffprobe.c
ffserver.c
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-05 03:10:45 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-31 19:40:08 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-20 00:27:38 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-26 15:37:22 +02:00
2011-08-04 20:59:36 +02:00
2011-06-24 03:07:04 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-04 00:45:21 +02:00
2011-08-14 00:05:36 +02:00
2011-07-04 00:45:21 +02:00
2011-09-04 04:11:53 +02:00
2011-08-13 02:56:08 +02:00
2011-08-22 15:00:53 +02:00
2011-07-03 03:14:10 +02:00
2011-07-16 19:43:35 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-01 00:58:49 +02:00
2011-07-24 23:52:42 +02:00
2011-08-22 09:35:58 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-26 20:53:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-09 19:56:25 +02:00
2011-08-09 19:56:25 +02:00
2011-08-09 19:56:25 +02:00
2011-07-04 00:45:21 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-15 17:51:09 +02:00
2011-07-17 20:12:02 +02:00
2011-08-22 12:13:27 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-03 20:06:38 +02:00
2011-07-18 16:43:46 +02:00
2011-09-05 03:10:45 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-15 23:35:53 +02:00
2011-07-17 20:12:02 +02:00
2011-07-14 02:24:10 +02:00
2011-07-17 20:12:02 +02:00
2011-08-30 10:46:51 +02:00
2011-08-26 01:29:40 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-06 01:34:08 +02:00
2011-07-17 20:12:02 +02:00
2011-08-20 00:27:38 +02:00
2011-08-20 00:27:38 +02:00
2011-08-18 00:21:21 +02:00
2011-08-28 23:13:17 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-04 00:45:21 +02:00
2011-08-30 09:14:05 +02:00
2011-08-22 15:00:53 +02:00
2011-06-11 03:51:36 +02:00
2011-07-11 04:23:25 +02:00
2011-07-17 20:12:02 +02:00
2011-08-28 21:43:04 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-09-01 01:31:03 +02:00
2011-08-30 10:46:51 +02:00
2011-08-27 23:57:24 +02:00
2011-08-09 19:56:25 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-15 00:40:54 +02:00
2011-09-02 20:40:54 +02:00
2011-08-13 19:13:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-04 00:45:21 +02:00
2011-07-17 20:12:02 +02:00
2011-09-05 03:10:45 +02:00
2011-07-17 20:12:02 +02:00
2011-08-24 23:20:09 +02:00
2011-08-24 23:13:57 +02:00
2011-08-10 21:03:39 +02:00
2011-07-17 20:12:02 +02:00
2011-09-04 04:11:53 +02:00
2011-07-04 00:45:21 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-15 17:51:09 +02:00
2011-07-17 20:12:02 +02:00
2011-08-15 23:35:53 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-06-18 05:10:38 +02:00
2011-07-14 20:44:58 +02:00
2011-08-30 23:45:39 +02:00
2011-07-17 20:12:02 +02:00
2011-09-01 01:31:03 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-04 00:45:21 +02:00
2011-07-03 03:14:10 +02:00
2011-07-04 00:45:21 +02:00
2011-06-18 05:10:38 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-22 12:08:52 +02:00
2011-06-18 05:10:38 +02:00
2011-06-15 20:21:33 +02:00
2011-06-17 05:49:58 +02:00
2011-08-22 12:13:27 +02:00
2011-06-11 03:51:36 +02:00
2011-07-25 16:37:12 +02:00
2011-07-19 18:46:04 +02:00
2011-07-19 18:46:04 +02:00
2011-08-15 23:35:53 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-06-11 03:51:36 +02:00
2011-08-26 23:18:54 +02:00
2011-07-04 00:45:21 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-01 00:58:49 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-15 23:35:53 +02:00
2011-08-25 21:43:30 +02:00
2011-07-14 20:44:58 +02:00
2011-09-01 01:31:03 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-09-04 04:11:53 +02:00
2011-08-27 22:12:51 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-09-01 20:23:40 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-03 18:30:02 +02:00
2011-07-15 16:57:35 +02:00
2011-08-21 15:27:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-26 16:26:57 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
d2084402e6