mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-01-06 06:05:32 +01:00
Merge branch 'release/0.8' into release/0.7
* release/0.8: (82 commits) Fix version numbers rtp: disable udp fifos, the rtp code cannot work with the fifos in its current form as rtp bypasses the public API. udp: allow fifo size to be tuned seperately riff: Add mpgv MPEG-2 fourcc Update Changelog matroskadec: fix integer underflow if header length < probe length. ffmpeg: fix operation with --disable-avfilter vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h build: Create mlib optimization directories during out-of-tree builds. changelog: misc typo and wording fixes (cherry picked from commitb047941d7d) doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. (cherry picked from commit5ccbf80963) matroskadec: matroska_read_seek after after EBML_STOP leads to failure. Update RELEASE file update Changelog mt: proper locking around release_buffer calls. vp8/mt: flush worker thread, not application thread context, on seek. docs: Mention the upstream bugzilla url about the dlltool vs MSVC issue docs: Use proper markup for a literal command line option docs: Don't recommend adding --enable-memalign-hack docs: Remove needless configure options ... Conflicts: VERSION libavcodec/opt.h libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
@@ -167,14 +167,14 @@ void ff_put_v(AVIOContext *bc, uint64_t val);
|
||||
|
||||
/**
|
||||
* Read a whole line of text from AVIOContext. Stop reading after reaching
|
||||
* either a \n, a \0 or EOF. The returned string is always \0 terminated,
|
||||
* either a \\n, a \\0 or EOF. The returned string is always \\0-terminated,
|
||||
* and may be truncated if the buffer is too small.
|
||||
*
|
||||
* @param s the read-only AVIOContext
|
||||
* @param buf buffer to store the read line
|
||||
* @param maxlen size of the buffer
|
||||
* @return the length of the string written in the buffer, not including the
|
||||
* final \0
|
||||
* final \\0
|
||||
*/
|
||||
int ff_get_line(AVIOContext *s, char *buf, int maxlen);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user