diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-24 02:12:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-24 02:16:11 +0100 |
| commit | 2fd41c9067fc67b40f80e9cbd4787018009040db (patch) | |
| tree | 378cc399057a6089f3f06bc62f0eff97d3ada56b /doc | |
| parent | 00dc0206cb5b351a66d7cce77b8a65fabe6ea7da (diff) | |
| parent | 4ec153bb66a95da46c98e269bd0aa787e6172ed3 (diff) | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
avio: make udp_set_remote_url/get_local_port internal.
asfdec: also subtract preroll when reading simple index object
matroskaenc: remove a variable that's unused after bc17bd9.
avio: cosmetics - nicer vertical alignment.
Remove unnecessary icc version checks
Disable 'attribute "foo" ignored' warnings from icc
rtsp: Don't use a locale dependent format string
Add xd55 codec tag for XDCAM HD422 720p25 CBR files.
configure: get libavcodec version from new version.h header
lavc: move the version macros to a new installed header.
matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config
Do not use format string "%0.3f" for RTSP Range field.
Add apply_window_int16() to DSPContext with x86-optimized versions and use it in the ac3_fixed encoder.
Document usage of import libraries created by dlltool
configure: Set the correct lib target for arm/wince dlltool
fate: simplify regression-funcs.sh
fate: add support for multithread testing
Conflicts:
libavformat/rtspdec.c
libavutil/attributes.h
libavutil/internal.h
libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/general.texi | 6 | ||||
| -rw-r--r-- | doc/protocols.texi | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/doc/general.texi b/doc/general.texi index 92bcc0d50d..346f25de9e 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -1009,6 +1009,12 @@ libavutil/pixdesc.h you should have: extern __declspec(dllimport) const AVPixFmtDescriptor av_pix_fmt_descriptors[]; @end example +Note that using import libraries created by dlltool requires +the linker optimization option to be set to +"References: Keep Unreferenced Data (/OPT:NOREF)", otherwise +the resulting binaries will fail during runtime. This isn't +required when using import libraries generated by lib.exe. + @subsection Cross compilation for Windows with Linux You must use the MinGW cross compilation tools available at diff --git a/doc/protocols.texi b/doc/protocols.texi index 29950eb8cd..3c57129ce0 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -433,9 +433,9 @@ set the time to live value (for multicast only) @item connect=@var{1|0} Initialize the UDP socket with @code{connect()}. In this case, the -destination address can't be changed with udp_set_remote_url later. +destination address can't be changed with ff_udp_set_remote_url later. If the destination address isn't known at the start, this option can -be specified in udp_set_remote_url, too. +be specified in ff_udp_set_remote_url, too. This allows finding out the source address for the packets with getsockname, and makes writes return with AVERROR(ECONNREFUSED) if "destination unreachable" is received. |