diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-03-06 18:04:49 +0100 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-03-07 12:25:36 -0500 |
| commit | e8bb2e24398ec838d9e49cf115b7e132609a9fb7 (patch) | |
| tree | c10594ceec9148eab34ae0c6816418d7f0602f83 /libavformat | |
| parent | 2790d7a9ffbd51f33e5367a31ace5c44c30401a1 (diff) | |
| download | ffmpeg-e8bb2e24398ec838d9e49cf115b7e132609a9fb7.tar.gz | |
avio: deprecate url_fget_max_packet_size
AVIOContext.max_packet_size should be used directly instead.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avio.h | 11 | ||||
| -rw-r--r-- | libavformat/aviobuf.c | 2 | ||||
| -rw-r--r-- | libavformat/rtpenc.c | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h index 6da0cfa1bb..09777a3615 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -633,15 +633,12 @@ int avio_open(AVIOContext **s, const char *url, int flags); int avio_close(AVIOContext *s); URLContext *url_fileno(AVIOContext *s); +#if FF_API_OLD_AVIO /** - * Return the maximum packet size associated to packetized buffered file - * handle. If the file is not packetized (stream like http or file on - * disk), then 0 is returned. - * - * @param s buffered file handle - * @return maximum packet size in bytes + * @deprecated use AVIOContext.max_packet_size directly. */ -int url_fget_max_packet_size(AVIOContext *s); +attribute_deprecated int url_fget_max_packet_size(AVIOContext *s); +#endif int url_open_buf(AVIOContext **s, uint8_t *buf, int buf_size, int flags); diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index aebdd7211a..6592e9acd6 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -942,12 +942,12 @@ char *url_fgets(AVIOContext *s, char *buf, int buf_size) *q = '\0'; return buf; } -#endif int url_fget_max_packet_size(AVIOContext *s) { return s->max_packet_size; } +#endif int av_url_read_fpause(AVIOContext *s, int pause) { diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index b32a9a4041..6c49d34c31 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -93,7 +93,7 @@ static int rtp_write_header(AVFormatContext *s1) s->first_rtcp_ntp_time = (s1->start_time_realtime / 1000) * 1000 + NTP_OFFSET_US; - max_packet_size = url_fget_max_packet_size(s1->pb); + max_packet_size = s1->pb->max_packet_size; if (max_packet_size <= 12) return AVERROR(EIO); s->buf = av_malloc(max_packet_size); |