diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-03-17 08:19:54 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-04-03 22:47:32 +0200 |
commit | 403ee835e7913eb9536b22c2b22edfdd700166a9 (patch) | |
tree | e93cbad528f5f9de1f3f8b9e4d3119a8ca942a33 /ffserver.c | |
parent | 6dc7d80de7236d04a6ee30f0e4cd03f055893bcf (diff) | |
download | ffmpeg-403ee835e7913eb9536b22c2b22edfdd700166a9.tar.gz |
avio: make url_open_dyn_packet_buf internal.
It doesn't look fit to be a part of the public API.
Adding a temporary hack to ffserver to be able to use it, should be
cleaned up when somebody is up for it.
Diffstat (limited to 'ffserver.c')
-rw-r--r-- | ffserver.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ffserver.c b/ffserver.c index 0ee61e2e50..3ad40e9bfb 100644 --- a/ffserver.c +++ b/ffserver.c @@ -33,6 +33,8 @@ #include "libavformat/os_support.h" #include "libavformat/rtpdec.h" #include "libavformat/rtsp.h" +// XXX for ffio_open_dyn_packet_buffer, to be removed +#include "libavformat/avio_internal.h" #include "libavutil/avstring.h" #include "libavutil/lfg.h" #include "libavutil/random_seed.h" @@ -2389,7 +2391,7 @@ static int http_prepare_data(HTTPContext *c) max_packet_size = RTSP_TCP_MAX_PACKET_SIZE; else max_packet_size = url_get_max_packet_size(c->rtp_handles[c->packet_stream_index]); - ret = url_open_dyn_packet_buf(&ctx->pb, max_packet_size); + ret = ffio_open_dyn_packet_buf(&ctx->pb, max_packet_size); } else { ret = avio_open_dyn_buf(&ctx->pb); } @@ -3444,7 +3446,7 @@ static int rtp_new_av_stream(HTTPContext *c, c->stream->filename, stream_index, c->protocol); /* normally, no packets should be output here, but the packet size may be checked */ - if (url_open_dyn_packet_buf(&ctx->pb, max_packet_size) < 0) { + if (ffio_open_dyn_packet_buf(&ctx->pb, max_packet_size) < 0) { /* XXX: close stream */ goto fail; } |