Michael Niedermayer
53ce990513
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
opt: Add av_opt_set_bin()
avconv: Display the error returned by avformat_write_header
rtpenc_chain: Return an error code instead of just a plain pointer
rtpenc_chain: Free the URLContext on failure
rtpenc: Expose the ssrc as an avoption
avprobe: display the codec profile in show_stream()
avprobe: fix function prototype
cosmetics: Fix indentation
avprobe: changelog entry
avprobe: update documentation
avprobe: provide JSON output
avprobe: output proper INI format
avprobe: improve formatting
rtmp: fix url parsing
fate: document TARGET_EXEC and its usage
Conflicts:
doc/APIchanges
doc/fate.texi
doc/ffprobe.texi
ffprobe.c
libavformat/version.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-26 22:37:37 +02:00
2012-05-07 22:51:34 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2012-05-10 02:25:41 +02:00
2012-04-13 21:50:37 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2012-05-10 23:30:42 +02:00
2012-02-04 20:27:02 +01:00
2011-11-23 04:02:17 +01:00
2011-12-22 01:51:53 +01:00
2011-11-23 04:02:17 +01:00
2011-11-11 04:24:00 +01:00
2012-04-20 09:43:11 -04:00
2012-04-20 09:43:11 -04:00
2012-04-09 23:02:33 +02:00
2012-04-09 23:02:33 +02:00
2011-05-22 04:53:19 +02:00
2011-11-07 03:01:43 +01:00
2011-12-13 00:39:48 +01:00
2012-05-26 22:37:37 +02:00
2012-01-22 23:06:04 +01:00
2011-11-23 04:02:17 +01:00
2012-05-14 19:11:39 +02:00
2012-05-14 19:11:39 +02:00
2011-12-13 00:39:48 +01:00
2011-03-19 13:33:20 +00:00
2012-05-25 02:41:28 +02:00
2012-04-30 18:31:06 +02:00
2012-04-30 18:31:06 +02:00
2011-03-19 13:33:20 +00:00
2011-12-05 00:11:57 +01:00
2012-01-29 00:34:59 +01:00
2012-04-02 21:23:56 +02:00
2011-09-21 21:25:43 +02:00
2011-11-07 03:01:43 +01:00
2012-03-20 00:03:19 +01:00
2012-05-09 11:26:11 +02:00
2012-05-18 23:34:11 +02:00
2012-04-01 11:01:08 +02:00
2011-12-12 01:25:37 +01:00
2012-05-15 18:08:32 +02:00
2012-05-15 18:08:32 +02:00
2012-01-28 07:53:34 +01:00
2011-10-16 21:51:28 +02:00
2012-04-13 18:40:17 +02:00
2011-11-23 04:02:17 +01:00
2011-06-28 13:14:46 +02:00
2011-06-28 13:14:46 +02:00
2011-12-13 00:39:48 +01:00
2012-01-29 00:34:59 +01:00
2011-12-12 01:25:37 +01:00
2011-12-11 18:47:19 +00:00
2011-11-23 04:02:17 +01:00
2011-06-18 05:10:38 +02:00
2011-06-08 05:25:28 +02:00
2012-04-04 21:17:52 +02:00
2011-07-04 00:45:21 +02:00
2010-01-16 04:49:02 +00:00
2011-10-22 19:49:27 +02:00
2011-07-12 01:42:32 +02:00
2011-03-19 13:33:20 +00:00
2012-05-10 19:11:23 +02:00
2012-02-06 11:30:54 +01:00
2012-03-26 13:00:09 +02:00
2011-12-31 16:31:15 +01:00
2012-05-07 22:51:34 +02:00
2012-02-21 05:10:12 +01:00
2012-02-21 05:10:12 +01:00
2011-07-04 00:45:21 +02:00
2012-01-29 00:34:59 +01:00
2012-04-16 22:13:12 +02:00
2011-12-25 18:55:43 +01:00
2012-05-26 22:37:37 +02:00
2012-05-26 22:37:37 +02:00
2012-05-09 02:53:42 +02:00
2012-05-18 00:38:06 +02:00
2011-06-29 23:49:03 +01:00
2011-06-29 23:49:03 +01:00
2012-05-08 08:39:37 +02:00
2012-03-21 19:01:39 +01:00
2012-05-24 00:42:31 +02:00
2012-02-23 23:44:38 +01:00
2011-11-23 04:02:17 +01:00
2012-03-26 13:00:09 +02:00
2011-11-23 04:02:17 +01:00
2011-03-19 13:33:20 +00:00
2011-06-24 03:07:04 +02:00
2012-05-10 02:25:41 +02:00
2012-05-10 02:25:41 +02:00
2012-02-14 01:53:31 +01:00
2011-11-23 04:02:17 +01:00
2011-05-11 13:43:30 +02:00
2011-05-11 13:43:30 +02:00
2012-02-03 00:56:27 +01:00
2012-02-02 14:30:28 +01:00
2012-01-06 02:45:12 +01:00
2012-02-09 18:37:58 +01:00
2011-12-05 00:11:57 +01:00
2012-05-20 16:19:36 +02:00
2011-12-22 03:01:17 +01:00
2011-03-19 13:33:20 +00:00
53ce990513