1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/doc
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
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
build_system.txt
decoders.texi
demuxers.texi
developer.texi build: Add 'check' target to run all compile and test targets. 2012-05-15 19:10:46 +02:00
encoders.texi
errno.txt
eval.texi
faq.texi
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
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
ffserver.texi
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
indevs.texi v4l2: allow to convert monotonic timestamps. 2012-04-04 15:22:44 +02:00
issue_tracker.txt
libavfilter.texi
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
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
swresample.txt cosmetics: fix some typos 2012-03-13 01:14:04 +01:00
swscale.txt
syntax.texi doc: add syntax.texi file 2012-05-22 00:39:53 +02:00
t2h.init
tablegen.txt
texi2pod.pl doc: texi2pod: add -I flag 2012-03-20 11:10:25 +00:00
viterbi.txt