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

..

doxy

doxygen: cleanup style to support older doxy

2011-12-29 17:19:46 +01:00

examples

doc/examples: make use of the parameter filters_descr parameter in init_filters().

2012-05-19 12:29:05 +02:00

APIchanges

Merge remote-tracking branch 'qatar/master'

2012-05-26 22:37:37 +02:00

avtools-common-opts.texi

cmdutils: allow to specify a stream by its ID.

2012-05-20 12:47:27 +02:00

avutil.txt

…

bitstream_filters.texi

Merge remote-tracking branch 'qatar/master'

2012-02-25 04:00:43 +01:00

build_system.txt

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00

decoders.texi

lavc: add ffwavesynth pseudo-codec.

2011-12-15 18:38:04 +01:00

demuxers.texi

lavf: add SBG demuxer.

2011-12-15 18:38:06 +01:00

developer.texi

build: Add 'check' target to run all compile and test targets.

2012-05-15 19:10:46 +02:00

encoders.texi

doc: use @command{} for commands.

2012-01-04 13:21:08 +01:00

errno.txt

doc: add a list of errno codes on some systems.

2011-12-21 19:59:45 +01:00

eval.texi

eval: add root() to solve f(x)=0

2012-02-27 00:00:55 +01:00

faq.texi

faq: fix typo.

2012-01-24 16:03:09 +01:00

fate.texi

Merge remote-tracking branch 'qatar/master'

2012-05-26 22:37:37 +02:00

ffmpeg.texi

doc: add syntax.texi file

2012-05-22 00:39:53 +02:00

ffmpeg.txt

Fix "ouput" typo and add a check.

2012-01-28 11:04:19 +01:00

ffplay.texi

doc: add syntax.texi file

2012-05-22 00:39:53 +02:00

ffprobe.texi

doc: add syntax.texi file

2012-05-22 00:39:53 +02:00

ffprobe.xsd

ffprobe: display the codec profile in show_stream()

2012-05-26 12:39:11 +02:00

ffserver.conf

Merge remote-tracking branch 'qatar/master'

2012-02-10 01:20:07 +01:00

ffserver.texi

Merge remote-tracking branch 'qatar/master'

2011-12-12 01:25:37 +01:00

filter_design.txt

lavfi: drop planar/packed negotiation support

2012-05-16 13:16:05 +02:00

filters.texi

Merge remote-tracking branch 'qatar/master'

2012-05-25 00:38:16 +02:00

general.texi

Merge remote-tracking branch 'qatar/master'

2012-05-19 00:52:25 +02:00

git-howto.texi

Merge remote-tracking branch 'qatar/master'

2012-04-13 21:50:37 +02:00

git-howto.txt

githowto: git is generally available as package in most distros.

2011-11-23 23:03:37 +01:00

indevs.texi

v4l2: allow to convert monotonic timestamps.

2012-04-04 15:22:44 +02:00

issue_tracker.txt

…

libavfilter.texi

doc: use @command{} for commands.

2012-01-04 13:21:08 +01:00

Makefile

doc: add syntax.texi file

2012-05-22 00:39:53 +02:00

metadata.texi

…

multithreading.txt

…

muxers.texi

doc/muxers: add documentation for the md5 and framemd5 muxers

2012-04-07 13:57:40 +02:00

optimization.txt

…

outdevs.texi

doc: use @command{} for commands.

2012-01-04 13:21:08 +01:00

platform.texi

Merge remote-tracking branch 'qatar/master'

2012-05-19 00:52:25 +02:00

print_options.c

print_options: warn that the files are generated.

2012-04-23 18:14:25 +02:00

protocols.texi

Merge remote-tracking branch 'qatar/master'

2012-05-26 22:37:37 +02:00

rate_distortion.txt

…

RELEASE_NOTES

release_notes: update

2012-05-25 17:27:40 +02:00

snow.txt

…

soc.txt

Merge remote-tracking branch 'qatar/master'

2011-12-12 01:25:37 +01:00

swresample.txt

cosmetics: fix some typos

2012-03-13 01:14:04 +01:00

swscale.txt

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00

syntax.texi

doc: add syntax.texi file

2012-05-22 00:39:53 +02:00

t2h.init

Merge remote-tracking branch 'qatar/master'

2011-12-10 02:01:03 +01:00

tablegen.txt

…

texi2pod.pl

doc: texi2pod: add -I flag

2012-03-20 11:10:25 +00:00

viterbi.txt

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00