aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-08-16 16:12:45 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-08-16 16:20:30 +0200
commitc581cb4e4fd3f8387766d3606560b2900728883a (patch)
treeecaecc6d276510379d8e399e88937c10a778be85 /doc
parent208d6e6615e3c2e09de5aab92745e13da86aa827 (diff)
parent232e35de2e139cc2d34ed67a34dedbbc5da56052 (diff)
downloadffmpeg-c581cb4e4fd3f8387766d3606560b2900728883a.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
-rw-r--r--doc/examples/decoding_encoding.c1
-rw-r--r--doc/protocols.texi3
2 files changed, 4 insertions, 0 deletions
diff --git a/doc/examples/decoding_encoding.c b/doc/examples/decoding_encoding.c
index 919ee489b6..288432f52c 100644
--- a/doc/examples/decoding_encoding.c
+++ b/doc/examples/decoding_encoding.c
@@ -34,6 +34,7 @@
#include <libavutil/opt.h>
#include <libavcodec/avcodec.h>
#include <libavutil/audioconvert.h>
+#include <libavutil/common.h>
#include <libavutil/imgutils.h>
#include <libavutil/mathematics.h>
#include <libavutil/samplefmt.h>
diff --git a/doc/protocols.texi b/doc/protocols.texi
index be19239a46..c8baa13acb 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -281,6 +281,9 @@ Size of the decompressed SWF file, required for SWFVerification.
@item rtmp_swfurl
URL of the SWF player for the media. By default no value will be sent.
+@item rtmp_swfverify
+URL to player swf file, compute hash/size automatically.
+
@item rtmp_tcurl
URL of the target stream. Defaults to proto://host[:port]/app.