RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 00:32:31 +00:00
Code Issues Projects Releases Wiki Activity

avio: deprecate url_fget_max_packet_size

Browse Source 
AVIOContext.max_packet_size should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e8bb2e2439)
This commit is contained in:
Anton Khirnov 2011-03-06 18:04:49 +01:00 committed by Michael Niedermayer
parent 5e06b02005
commit 718975aa11
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/avio.h
View File

@ -627,15 +627,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);

2
libavformat/aviobuf.c
View File

@ -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)
{

2
libavformat/rtpenc.c
View File

@ -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);