diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 14:15:33 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 14:15:33 +0200 |
commit | 43cce41267a7aa71946911e87b4dfce48183bb25 (patch) | |
tree | 65005ccffc4a671a46163fc3e47b5f1c40b9e12d /doc/faq.texi | |
parent | caa7e24eb1d47a0dfeb9783909bce7df6d3f5482 (diff) | |
parent | 0a75d1da23b8659ec49391469bb592da12760077 (diff) | |
download | ffmpeg-43cce41267a7aa71946911e87b4dfce48183bb25.tar.gz |
Merge commit '0a75d1da23b8659ec49391469bb592da12760077'
* commit '0a75d1da23b8659ec49391469bb592da12760077':
options_table: refs option is not snow-only
random_seed: Support using CryptGenRandom on windows
doc: update the faq entry about custom I/O
Conflicts:
doc/faq.texi
libavcodec/options_table.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/faq.texi')
-rw-r--r-- | doc/faq.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/faq.texi b/doc/faq.texi index 5477faf219..1158091a0c 100644 --- a/doc/faq.texi +++ b/doc/faq.texi @@ -467,8 +467,8 @@ to use them you have to append -D__STDC_CONSTANT_MACROS to your CXXFLAGS @section I have a file in memory / a API different from *open/*read/ libc how do I use it with libavformat? -You have to implement a URLProtocol, see @file{libavformat/file.c} in -FFmpeg and @file{libmpdemux/demux_lavf.c} in MPlayer sources. +You have to create a custom AVIOContext using @code{avio_alloc_context}, +see @file{libavformat/aviobuf.c} in FFmpeg and @file{libmpdemux/demux_lavf.c} in MPlayer or MPlayer2 sources. @section Where can I find libav* headers for Pascal/Delphi? |