diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-26 22:37:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-26 22:37:37 +0200 |
| commit | 53ce9905134e042516ddd7a4476dc668c0b094c4 (patch) | |
| tree | 05e80abb4ef8b78c7c93bc920b32fb34ac268cc7 /doc | |
| parent | a48b890392aa22033f182421ba9e3f3b3256461d (diff) | |
| parent | 154486f9adc621e620dacd76d78c30a02cc1dcd3 (diff) | |
| download | ffmpeg-53ce9905134e042516ddd7a4476dc668c0b094c4.tar.gz | |
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>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | doc/fate.texi | 8 | ||||
| -rw-r--r-- | doc/protocols.texi | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index b6b78b5237..b14204af29 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -31,6 +31,9 @@ API changes, most recent first: 2012-03-26 - a67d9cf - lavfi 2.66.100 Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions. +2012-05-25 - e0e0793 - lavu 51.31.0 - opt.h + Add av_opt_set_bin() + 2012-05-15 - lavfi 2.17.0 Add support for audio filters ac71230/a2cd9be - add video/audio buffer sink in a new installed diff --git a/doc/fate.texi b/doc/fate.texi index 07d8c53599..cfb694ab65 100644 --- a/doc/fate.texi +++ b/doc/fate.texi @@ -78,6 +78,9 @@ Do not put a '~' character in the samples path to indicate a home directory. Because of shell nuances, this will cause FATE to fail. @end float +To use a custom wrapper to run the test, pass @option{--target-exec} to +@command{configure} or set the @var{TARGET_EXEC} Make variable. + @chapter Submitting the results to the FFmpeg result aggregation server @@ -168,6 +171,11 @@ the synchronisation of the samples directory. quite useful to detect thread-related regressions. @item CPUFLAGS Specify CPU flags. +@item TARGET_EXEC + Specify or override the wrapper used to run the tests. + The @var{TARGET_EXEC} option provides a way to run FATE wrapped in + @command{valgrind}, @command{qemu-user} or @command{wine} or on remote targets + through @command{ssh}. @end table Example: diff --git a/doc/protocols.texi b/doc/protocols.texi index ae1c9b84e6..4575a679b9 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -194,7 +194,7 @@ content across a TCP/IP network. The required syntax is: @example -rtmp://@var{server}[:@var{port}][/@var{app}][/@var{playpath}] +rtmp://@var{server}[:@var{port}][/@var{app}][/@var{instance}][/@var{playpath}] @end example The accepted parameters are: |