1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavformat
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-04-16 15:27:39 +02:00
2012-05-21 08:51:50 +02:00
2011-11-05 16:51:25 +01:00
2012-05-23 19:49:25 +02:00
2011-12-19 11:57:34 +01:00
2012-03-03 04:30:49 +01:00
2011-08-01 00:58:49 +02:00
2012-05-10 04:17:03 +02:00
2011-12-30 20:00:53 +01:00
2011-08-09 19:56:25 +02:00
2012-05-07 02:42:00 +02:00
2012-05-20 16:29:08 +02:00
2012-04-06 08:32:09 +02:00
2012-03-30 05:16:15 +02:00
2012-05-26 00:18:15 +02:00
2012-05-21 08:51:50 +02:00
2012-03-31 12:37:42 +02:00
2012-05-21 08:51:50 +02:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2012-05-08 03:47:58 +02:00
2012-03-10 18:01:03 +01:00
2012-04-19 15:08:13 +02:00
2012-05-08 10:37:13 +02:00
2012-04-18 15:30:34 +02:00
2012-02-29 14:26:14 +01:00
2012-02-28 07:20:36 +01:00
2012-02-23 16:00:22 +01:00
2012-02-14 10:12:44 +01:00
2012-05-18 23:34:11 +02:00
2012-04-03 19:12:52 +02:00
2011-12-30 20:00:53 +01:00