diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-09 03:09:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-09 03:17:07 +0200 |
| commit | d4d09329eef30787da699c7a397b00f6f96940bc (patch) | |
| tree | 3605d4e30063b924254a373e270026bca6436f11 /ffserver.c | |
| parent | a61bc91d42945e6ccefef4867ef32d2073f8f8c7 (diff) | |
| parent | 0c68c804196400de3c40c8849124b292ed62b99c (diff) | |
| download | ffmpeg-d4d09329eef30787da699c7a397b00f6f96940bc.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
lavf: bump minor and add an APIChanges entry for avformat cleanup
lavf: get rid of ffm-specific stuff in avformat.h
Not pulled: avio: deprecate av_protocol_next().
avio: add a function for iterating though protocol names.
lavf: rename a parameter of av_sdp_create from buff->buf
lavf: rename avf_sdp_create to av_sdp_create.
lavf: make av_guess_image2_codec internal
avio: make URLProtocol internal.
avio: make URLContext internal.
lavf: mark av_pkt_dump(_log) for remove on $next+1 bump.
lavf: use designated initializers for all protocols
applehttp: don't use deprecated url_ functions.
avio: move two ff_udp_* functions from avio_internal to url.h
asfdec: remove a forgotten declaration of nonexistent function
avio: deprecate the typedef for URLInterruptCB
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c index 6e429799ae..a047e7338b 100644 --- a/ffserver.c +++ b/ffserver.c @@ -29,6 +29,7 @@ #include <strings.h> #include <stdlib.h> #include "libavformat/avformat.h" +#include "libavformat/ffm.h" #include "libavformat/network.h" #include "libavformat/os_support.h" #include "libavformat/rtpdec.h" @@ -2957,7 +2958,7 @@ static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer, avc->streams[i]->codec = stream->streams[i]->codec; } *pbuffer = av_mallocz(2048); - avf_sdp_create(&avc, 1, *pbuffer, 2048); + av_sdp_create(&avc, 1, *pbuffer, 2048); sdp_done: #if !FF_API_MAX_STREAMS |