summaryrefslogtreecommitdiff
path: root/libavformat/sapenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-09 03:09:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-09 03:17:07 +0200
commitd4d09329eef30787da699c7a397b00f6f96940bc (patch)
tree3605d4e30063b924254a373e270026bca6436f11 /libavformat/sapenc.c
parenta61bc91d42945e6ccefef4867ef32d2073f8f8c7 (diff)
parent0c68c804196400de3c40c8849124b292ed62b99c (diff)
downloadffmpeg-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 'libavformat/sapenc.c')
-rw-r--r--libavformat/sapenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/sapenc.c b/libavformat/sapenc.c
index e538bbb4a2..4ca14ad964 100644
--- a/libavformat/sapenc.c
+++ b/libavformat/sapenc.c
@@ -208,7 +208,7 @@ static int sap_write_header(AVFormatContext *s)
av_strlcpy(&sap->ann[pos], "application/sdp", sap->ann_size - pos);
pos += strlen(&sap->ann[pos]) + 1;
- if (avf_sdp_create(contexts, s->nb_streams, &sap->ann[pos],
+ if (av_sdp_create(contexts, s->nb_streams, &sap->ann[pos],
sap->ann_size - pos)) {
ret = AVERROR_INVALIDDATA;
goto fail;