History

avio: avio_ prefix for url_close_dyn_buf

Anton Khirnov committed 15 years ago

Commit 6dc7d801 parent b92c54520 files · +53 −48Browse files

Unified · Split

20 files
  1. ffserver.c +8 −8
  2. libavformat/asfenc.c +3 −3
  3. libavformat/avc.c +1 −1
  4. libavformat/avio.h +2 −1
  5. libavformat/aviobuf.c +6 −2
  6. libavformat/matroskaenc.c +2 −2
  7. libavformat/movenc.c +1 −1
  8. libavformat/movenchint.c +3 −3
  9. libavformat/mp3enc.c +1 −1
  10. libavformat/nutenc.c +6 −6
  11. libavformat/oggenc.c +1 −1
  12. libavformat/rtpdec.c +3 −3
  13. libavformat/rtpdec_asf.c +3 −3
  14. libavformat/rtpdec_latm.c +3 −3
  15. libavformat/rtpdec_svq3.c +3 −3
  16. libavformat/rtpdec_vp8.c +2 −2
  17. libavformat/rtpdec_xiph.c +2 −2
  18. libavformat/rtpenc_chain.c +1 −1
  19. libavformat/rtsp.c +1 −1
  20. libavformat/rtspenc.c +1 −1
ffserver.c+8−8
@@ -872,7 +872,7 @@ static void close_connection(HTTPContext *c) · 871 unmodified lines
872872 if (avio_open_dyn_buf(&ctx->pb) >= 0) {
873873 av_write_trailer(ctx);
874874 av_freep(&c->pb_buffer);
875− url_close_dyn_buf(ctx->pb, &c->pb_buffer);
875+ avio_close_dyn_buf(ctx->pb, &c->pb_buffer);
876876 }
877877 }
878878 }
@@ -2101,7 +2101,7 @@ static void compute_status(HTTPContext *c) · 1222 unmodified lines
21012101 avio_printf(pb, "<hr size=1 noshade>Generated at %s", p);
21022102 avio_printf(pb, "</body>\n</html>\n");
21032103
2104− len = url_close_dyn_buf(pb, &c->pb_buffer);
2104+ len = avio_close_dyn_buf(pb, &c->pb_buffer);
21052105 c->buffer_ptr = c->pb_buffer;
21062106 c->buffer_end = c->pb_buffer + len;
21072107 }
@@ -2277,7 +2277,7 @@ static int http_prepare_data(HTTPContext *c) · 169 unmodified lines
22772277 }
22782278 av_metadata_free(&c->fmt_ctx.metadata);
22792279
2280− len = url_close_dyn_buf(c->fmt_ctx.pb, &c->pb_buffer);
2280+ len = avio_close_dyn_buf(c->fmt_ctx.pb, &c->pb_buffer);
22812281 c->buffer_ptr = c->pb_buffer;
22822282 c->buffer_end = c->pb_buffer + len;
22832283
@@ -2410,7 +2410,7 @@ static int http_prepare_data(HTTPContext *c) · 126 unmodified lines
24102410 c->state = HTTPSTATE_SEND_DATA_TRAILER;
24112411 }
24122412
2413− len = url_close_dyn_buf(ctx->pb, &c->pb_buffer);
2413+ len = avio_close_dyn_buf(ctx->pb, &c->pb_buffer);
24142414 c->cur_frame_bytes = len;
24152415 c->buffer_ptr = c->pb_buffer;
24162416 c->buffer_end = c->pb_buffer + len;
@@ -2438,7 +2438,7 @@ static int http_prepare_data(HTTPContext *c) · 21 unmodified lines
24382438 }
24392439 c->fmt_ctx.pb->seekable = 0;
24402440 av_write_trailer(ctx);
2441− len = url_close_dyn_buf(ctx->pb, &c->pb_buffer);
2441+ len = avio_close_dyn_buf(ctx->pb, &c->pb_buffer);
24422442 c->buffer_ptr = c->pb_buffer;
24432443 c->buffer_end = c->pb_buffer + len;
24442444
@@ -2518,7 +2518,7 @@ static int http_send_data(HTTPContext *c) · 73 unmodified lines
25182518 /* write RTP packet data */
25192519 c->buffer_ptr += 4;
25202520 avio_write(pb, c->buffer_ptr, len);
2521− size = url_close_dyn_buf(pb, &c->packet_buffer);
2521+ size = avio_close_dyn_buf(pb, &c->packet_buffer);
25222522 /* prepare asynchronous TCP sending */
25232523 rtsp_c->packet_buffer_ptr = c->packet_buffer;
25242524 rtsp_c->packet_buffer_end = c->packet_buffer + size;
@@ -2907,7 +2907,7 @@ static int rtsp_parse_request(HTTPContext *c) · 382 unmodified lines
29072907 rtsp_reply_error(c, RTSP_STATUS_METHOD);
29082908
29092909 the_end:
2910− len = url_close_dyn_buf(c->pb, &c->pb_buffer);
2910+ len = avio_close_dyn_buf(c->pb, &c->pb_buffer);
29112911 c->pb = NULL; /* safety */
29122912 if (len < 0) {
29132913 /* XXX: cannot do more */
@@ -3456,7 +3456,7 @@ static int rtp_new_av_stream(HTTPContext *c, · 542 unmodified lines
34563456 av_free(ctx);
34573457 return -1;
34583458 }
3459− url_close_dyn_buf(ctx->pb, &dummy_buf);
3459+ avio_close_dyn_buf(ctx->pb, &dummy_buf);
34603460 av_free(dummy_buf);
34613461
34623462 c->rtp_ctx[stream_index] = ctx;
libavformat/asfenc.c+3−3
@@ -238,7 +238,7 @@ static void put_str16(AVIOContext *s, const char *tag) · 237 unmodified lines
238238 return;
239239
240240 avio_put_str16le(dyn_buf, tag);
241− len = url_close_dyn_buf(dyn_buf, &pb);
241+ len = avio_close_dyn_buf(dyn_buf, &pb);
242242 avio_wl16(s, len);
243243 avio_write(s, pb, len);
244244 av_freep(&pb);
@@ -375,7 +375,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data · 130 unmodified lines
375375 len = tags[n] ? avio_put_str16le(dyn_buf, tags[n]->value) : 0;
376376 avio_wl16(pb, len);
377377 }
378− len = url_close_dyn_buf(dyn_buf, &buf);
378+ len = avio_close_dyn_buf(dyn_buf, &buf);
379379 avio_write(pb, buf, len);
380380 av_freep(&buf);
381381 end_header(pb, hpos);
@@ -501,7 +501,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data · 119 unmodified lines
501501 return AVERROR(ENOMEM);
502502
503503 avio_put_str16le(dyn_buf, desc);
504− len = url_close_dyn_buf(dyn_buf, &buf);
504+ len = avio_close_dyn_buf(dyn_buf, &buf);
505505 avio_wl16(pb, len / 2); // "number of characters" = length in bytes / 2
506506
507507 avio_write(pb, buf, len);
libavformat/avc.c+1−1
@@ -96,7 +96,7 @@ int ff_avc_parse_nal_units_buf(const uint8_t *buf_in, uint8_t **buf, int *size) · 95 unmodified lines
9696 ff_avc_parse_nal_units(pb, buf_in, *size);
9797
9898 av_freep(buf);
99− *size = url_close_dyn_buf(pb, buf);
99+ *size = avio_close_dyn_buf(pb, buf);
100100 return 0;
101101 }
102102
libavformat/avio.h+2−1
@@ -448,6 +448,7 @@ attribute_deprecated int url_fprintf(AVIOContext *s, const char *fmt, ...); · 447 unmodified lines
448448 #endif
449449 attribute_deprecated void put_flush_packet(AVIOContext *s);
450450 attribute_deprecated int url_open_dyn_buf(AVIOContext **s);
451+attribute_deprecated int url_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer);
451452 /**
452453 * @}
453454 */
@@ -704,7 +705,7 @@ int url_open_dyn_packet_buf(AVIOContext **s, int max_packet_size); · 250 unmodified lines
704705 * @param pbuffer pointer to a byte buffer
705706 * @return the length of the byte buffer
706707 */
707−int url_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer);
708+int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer);
708709
709710 #if FF_API_UDP_GET_FILE
710711 int udp_get_file_handle(URLContext *h);
libavformat/aviobuf.c+6−2
@@ -423,6 +423,10 @@ int url_open_dyn_buf(AVIOContext **s) · 422 unmodified lines
423423 {
424424 return avio_open_dyn_buf(s);
425425 }
426+int url_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer)
427+{
428+ return avio_close_dyn_buf(s, pbuffer);
429+}
426430 #endif
427431
428432 int avio_put_str(AVIOContext *s, const char *str)
@@ -1027,7 +1031,7 @@ int64_t ffio_read_seek(AVIOContext *s, int stream_index, · 598 unmodified lines
10271031 return ret;
10281032 }
10291033
1030−/* avio_open_dyn_buf and url_close_dyn_buf are used in rtp.c to send a response
1034+/* avio_open_dyn_buf and avio_close_dyn_buf are used in rtp.c to send a response
10311035 * back to the server even if CONFIG_MUXERS is false. */
10321036 #if CONFIG_MUXERS || CONFIG_NETWORK
10331037 /* buffer handling */
@@ -1163,7 +1167,7 @@ int url_open_dyn_packet_buf(AVIOContext **s, int max_packet_size) · 129 unmodified lines
11631167 return url_open_dyn_buf_internal(s, max_packet_size);
11641168 }
11651169
1166−int url_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer)
1170+int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer)
11671171 {
11681172 DynBuffer *d = s->opaque;
11691173 int size;
libavformat/matroskaenc.c+2−2
@@ -498,7 +498,7 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, AVCodecCo · 497 unmodified lines
498498 ff_put_wav_header(dyn_cp, codec);
499499 }
500500
501− codecpriv_size = url_close_dyn_buf(dyn_cp, &codecpriv);
501+ codecpriv_size = avio_close_dyn_buf(dyn_cp, &codecpriv);
502502 if (codecpriv_size)
503503 put_ebml_binary(pb, MATROSKA_ID_CODECPRIVATE, codecpriv, codecpriv_size);
504504 av_free(codecpriv);
@@ -1003,7 +1003,7 @@ static void mkv_flush_dynbuf(AVFormatContext *s) · 498 unmodified lines
10031003 if (!mkv->dyn_bc)
10041004 return;
10051005
1006− bufsize = url_close_dyn_buf(mkv->dyn_bc, &dyn_buf);
1006+ bufsize = avio_close_dyn_buf(mkv->dyn_bc, &dyn_buf);
10071007 avio_write(s->pb, dyn_buf, bufsize);
10081008 av_free(dyn_buf);
10091009 mkv->dyn_bc = NULL;
libavformat/movenc.c+1−1
@@ -1691,7 +1691,7 @@ static int mov_write_udta_tag(AVIOContext *pb, MOVMuxContext *mov, · 1690 unmodified lines
16911691 if (s->nb_chapters)
16921692 mov_write_chpl_tag(pb_buf, s);
16931693
1694− if ((size = url_close_dyn_buf(pb_buf, &buf)) > 0) {
1694+ if ((size = avio_close_dyn_buf(pb_buf, &buf)) > 0) {
16951695 avio_wb32(pb, size+8);
16961696 ffio_wfourcc(pb, "udta");
16971697 avio_write(pb, buf, size);
libavformat/movenchint.c+3−3
@@ -408,7 +408,7 @@ int ff_mov_add_hinted_packet(AVFormatContext *s, AVPacket *pkt, · 407 unmodified lines
408408
409409 /* Fetch the output from the RTP muxer, open a new output buffer
410410 * for next time. */
411− size = url_close_dyn_buf(rtp_ctx->pb, &buf);
411+ size = avio_close_dyn_buf(rtp_ctx->pb, &buf);
412412 if ((ret = url_open_dyn_packet_buf(&rtp_ctx->pb,
413413 RTP_MAX_PACKET_SIZE)) < 0)
414414 goto done;
@@ -424,7 +424,7 @@ int ff_mov_add_hinted_packet(AVFormatContext *s, AVPacket *pkt, · 9 unmodified lines
424424 av_freep(&buf);
425425
426426 /* Write the hint data into the hint track */
427− hint_pkt.size = size = url_close_dyn_buf(hintbuf, &buf);
427+ hint_pkt.size = size = avio_close_dyn_buf(hintbuf, &buf);
428428 hint_pkt.data = buf;
429429 hint_pkt.pts = hint_pkt.dts;
430430 hint_pkt.stream_index = track_index;
@@ -448,7 +448,7 @@ void ff_mov_close_hinting(MOVTrack *track) { · 17 unmodified lines
448448 return;
449449 if (rtp_ctx->pb) {
450450 av_write_trailer(rtp_ctx);
451− url_close_dyn_buf(rtp_ctx->pb, &ptr);
451+ avio_close_dyn_buf(rtp_ctx->pb, &ptr);
452452 av_free(ptr);
453453 }
454454 avformat_free_context(rtp_ctx);
libavformat/mp3enc.c+1−1
@@ -115,7 +115,7 @@ static int id3v2_put_ttag(AVFormatContext *s, const char *str1, const char *str2 · 114 unmodified lines
115115 put(dyn_buf, str1);
116116 if (str2)
117117 put(dyn_buf, str2);
118− len = url_close_dyn_buf(dyn_buf, &pb);
118+ len = avio_close_dyn_buf(dyn_buf, &pb);
119119
120120 avio_wb32(s->pb, tag);
121121 id3v2_put_size(s, len);
libavformat/nutenc.c+6−6
@@ -281,7 +281,7 @@ static inline void put_s_trace(AVIOContext *bc, int64_t v, char *file, char *fun · 280 unmodified lines
281281 //FIXME remove calculate_checksum
282282 static void put_packet(NUTContext *nut, AVIOContext *bc, AVIOContext *dyn_bc, int calculate_checksum, uint64_t startcode){
283283 uint8_t *dyn_buf=NULL;
284− int dyn_size= url_close_dyn_buf(dyn_bc, &dyn_buf);
284+ int dyn_size= avio_close_dyn_buf(dyn_bc, &dyn_buf);
285285 int forw_ptr= dyn_size + 4*calculate_checksum;
286286
287287 if(forw_ptr > 4096)
@@ -450,7 +450,7 @@ static int write_globalinfo(NUTContext *nut, AVIOContext *bc){ · 162 unmodified lines
450450
451451 ff_put_v(bc, count);
452452
453− dyn_size= url_close_dyn_buf(dyn_bc, &dyn_buf);
453+ dyn_size= avio_close_dyn_buf(dyn_bc, &dyn_buf);
454454 avio_write(bc, dyn_buf, dyn_size);
455455 av_free(dyn_buf);
456456 return 0;
@@ -470,7 +470,7 @@ static int write_streaminfo(NUTContext *nut, AVIOContext *bc, int stream_id){ · 13 unmodified lines
470470 if (st->disposition & ff_nut_dispositions[i].flag)
471471 count += add_info(dyn_bc, "Disposition", ff_nut_dispositions[i].str);
472472 }
473− dyn_size = url_close_dyn_buf(dyn_bc, &dyn_buf);
473+ dyn_size = avio_close_dyn_buf(dyn_bc, &dyn_buf);
474474
475475 if (count) {
476476 ff_put_v(bc, stream_id + 1); //stream_id_plus1
@@ -509,7 +509,7 @@ static int write_chapter(NUTContext *nut, AVIOContext *bc, int id) · 32 unmodified lines
509509
510510 ff_put_v(bc, count);
511511
512− dyn_size = url_close_dyn_buf(dyn_bc, &dyn_buf);
512+ dyn_size = avio_close_dyn_buf(dyn_bc, &dyn_buf);
513513 avio_write(bc, dyn_buf, dyn_size);
514514 av_freep(&dyn_buf);
515515 return 0;
@@ -554,7 +554,7 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc){ · 38 unmodified lines
554554 put_packet(nut, bc, dyn_bc, 1, INFO_STARTCODE);
555555 else {
556556 uint8_t* buf;
557− url_close_dyn_buf(dyn_bc, &buf);
557+ avio_close_dyn_buf(dyn_bc, &buf);
558558 av_free(buf);
559559 }
560560 }
@@ -566,7 +566,7 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc){ · 5 unmodified lines
566566 ret = write_chapter(nut, dyn_bc, i);
567567 if (ret < 0) {
568568 uint8_t *buf;
569− url_close_dyn_buf(dyn_bc, &buf);
569+ avio_close_dyn_buf(dyn_bc, &buf);
570570 av_freep(&buf);
571571 return ret;
572572 }
libavformat/oggenc.c+1−1
@@ -101,7 +101,7 @@ static int ogg_write_page(AVFormatContext *s, OGGPage *page, int extra_flags) · 100 unmodified lines
101101 ogg_update_checksum(s, pb, crc_offset);
102102 avio_flush(pb);
103103
104− size = url_close_dyn_buf(pb, &buf);
104+ size = avio_close_dyn_buf(pb, &buf);
105105 if (size < 0)
106106 return size;
107107
libavformat/rtpdec.c+3−3
@@ -321,7 +321,7 @@ int rtp_check_and_send_back_rr(RTPDemuxContext *s, int count) · 320 unmodified lines
321321 }
322322
323323 avio_flush(pb);
324− len = url_close_dyn_buf(pb, &buf);
324+ len = avio_close_dyn_buf(pb, &buf);
325325 if ((len > 0) && buf) {
326326 int result;
327327 av_dlog(s->ic, "sending %d bytes of RR\n", len);
@@ -349,7 +349,7 @@ void rtp_send_punch_packets(URLContext* rtp_handle) · 21 unmodified lines
349349 avio_wb32(pb, 0); /* SSRC */
350350
351351 avio_flush(pb);
352− len = url_close_dyn_buf(pb, &buf);
352+ len = avio_close_dyn_buf(pb, &buf);
353353 if ((len > 0) && buf)
354354 url_write(rtp_handle, buf, len);
355355 av_free(buf);
@@ -364,7 +364,7 @@ void rtp_send_punch_packets(URLContext* rtp_handle) · 8 unmodified lines
364364 avio_wb32(pb, 0); /* our own SSRC */
365365
366366 avio_flush(pb);
367− len = url_close_dyn_buf(pb, &buf);
367+ len = avio_close_dyn_buf(pb, &buf);
368368 if ((len > 0) && buf)
369369 url_write(rtp_handle, buf, len);
370370 av_free(buf);
libavformat/rtpdec_asf.c+3−3
@@ -203,7 +203,7 @@ static int asfrtp_parse_packet(AVFormatContext *s, PayloadContext *asf, · 202 unmodified lines
203203 */
204204 if (asf->pktbuf && len_off != avio_tell(asf->pktbuf)) {
205205 uint8_t *p;
206− url_close_dyn_buf(asf->pktbuf, &p);
206+ avio_close_dyn_buf(asf->pktbuf, &p);
207207 asf->pktbuf = NULL;
208208 av_free(p);
209209 }
@@ -217,7 +217,7 @@ static int asfrtp_parse_packet(AVFormatContext *s, PayloadContext *asf, · 7 unmodified lines
217217 avio_skip(pb, len - off);
218218 if (!(flags & RTP_FLAG_MARKER))
219219 return -1;
220− out_len = url_close_dyn_buf(asf->pktbuf, &asf->buf);
220+ out_len = avio_close_dyn_buf(asf->pktbuf, &asf->buf);
221221 asf->pktbuf = NULL;
222222 } else {
223223 /**
@@ -272,7 +272,7 @@ static void asfrtp_free_context(PayloadContext *asf) · 48 unmodified lines
272272 {
273273 if (asf->pktbuf) {
274274 uint8_t *p = NULL;
275− url_close_dyn_buf(asf->pktbuf, &p);
275+ avio_close_dyn_buf(asf->pktbuf, &p);
276276 asf->pktbuf = NULL;
277277 av_free(p);
278278 }
libavformat/rtpdec_latm.c+3−3
@@ -43,7 +43,7 @@ static void latm_free_context(PayloadContext *data) · 42 unmodified lines
4343 return;
4444 if (data->dyn_buf) {
4545 uint8_t *p;
46− url_close_dyn_buf(data->dyn_buf, &p);
46+ avio_close_dyn_buf(data->dyn_buf, &p);
4747 av_free(p);
4848 }
4949 av_free(data->buf);
@@ -60,7 +60,7 @@ static int latm_parse_packet(AVFormatContext *ctx, PayloadContext *data, · 10 unmodified lines
6060 if (!data->dyn_buf || data->timestamp != *timestamp) {
6161 av_freep(&data->buf);
6262 if (data->dyn_buf)
63− url_close_dyn_buf(data->dyn_buf, &data->buf);
63+ avio_close_dyn_buf(data->dyn_buf, &data->buf);
6464 data->dyn_buf = NULL;
6565 av_freep(&data->buf);
6666
@@ -73,7 +73,7 @@ static int latm_parse_packet(AVFormatContext *ctx, PayloadContext *data, · 6 unmodified lines
7373 if (!(flags & RTP_FLAG_MARKER))
7474 return AVERROR(EAGAIN);
7575 av_free(data->buf);
76− data->len = url_close_dyn_buf(data->dyn_buf, &data->buf);
76+ data->len = avio_close_dyn_buf(data->dyn_buf, &data->buf);
7777 data->dyn_buf = NULL;
7878 data->pos = 0;
7979 }
libavformat/rtpdec_svq3.c+3−3
@@ -83,7 +83,7 @@ static int svq3_parse_packet (AVFormatContext *s, PayloadContext *sv, · 82 unmodified lines
8383
8484 if (sv->pktbuf) {
8585 uint8_t *tmp;
86− url_close_dyn_buf(sv->pktbuf, &tmp);
86+ avio_close_dyn_buf(sv->pktbuf, &tmp);
8787 av_free(tmp);
8888 }
8989 if ((res = avio_open_dyn_buf(&sv->pktbuf)) < 0)
@@ -100,7 +100,7 @@ static int svq3_parse_packet (AVFormatContext *s, PayloadContext *sv, · 10 unmodified lines
100100 av_init_packet(pkt);
101101 pkt->stream_index = st->index;
102102 *timestamp = sv->timestamp;
103− pkt->size = url_close_dyn_buf(sv->pktbuf, &pkt->data);
103+ pkt->size = avio_close_dyn_buf(sv->pktbuf, &pkt->data);
104104 pkt->destruct = av_destruct_packet;
105105 sv->pktbuf = NULL;
106106 return 0;
@@ -118,7 +118,7 @@ static void svq3_extradata_free(PayloadContext *sv) · 11 unmodified lines
118118 {
119119 if (sv->pktbuf) {
120120 uint8_t *buf;
121− url_close_dyn_buf(sv->pktbuf, &buf);
121+ avio_close_dyn_buf(sv->pktbuf, &buf);
122122 av_free(buf);
123123 }
124124 av_free(sv);
libavformat/rtpdec_vp8.c+2−2
@@ -41,7 +41,7 @@ static void prepare_packet(AVPacket *pkt, PayloadContext *vp8, int stream) · 40 unmodified lines
4141 av_init_packet(pkt);
4242 pkt->stream_index = stream;
4343 pkt->flags = vp8->is_keyframe ? AV_PKT_FLAG_KEY : 0;
44− pkt->size = url_close_dyn_buf(vp8->data, &pkt->data);
44+ pkt->size = avio_close_dyn_buf(vp8->data, &pkt->data);
4545 pkt->destruct = av_destruct_packet;
4646 vp8->data = NULL;
4747 }
@@ -138,7 +138,7 @@ static void vp8_free_context(PayloadContext *vp8) · 90 unmodified lines
138138 {
139139 if (vp8->data) {
140140 uint8_t *tmp;
141− url_close_dyn_buf(vp8->data, &tmp);
141+ avio_close_dyn_buf(vp8->data, &tmp);
142142 av_free(tmp);
143143 }
144144 av_free(vp8);
libavformat/rtpdec_xiph.c+2−2
@@ -57,7 +57,7 @@ static inline void free_fragment_if_needed(PayloadContext * data) · 56 unmodified lines
5757 {
5858 if (data->fragment) {
5959 uint8_t* p;
60− url_close_dyn_buf(data->fragment, &p);
60+ avio_close_dyn_buf(data->fragment, &p);
6161 av_free(p);
6262 data->fragment = NULL;
6363 }
@@ -203,7 +203,7 @@ static int xiph_handle_packet(AVFormatContext * ctx, · 139 unmodified lines
203203 if (fragmented == 3) {
204204 // end of xiph data packet
205205 av_init_packet(pkt);
206− pkt->size = url_close_dyn_buf(data->fragment, &pkt->data);
206+ pkt->size = avio_close_dyn_buf(data->fragment, &pkt->data);
207207
208208 if (pkt->size < 0) {
209209 av_log(ctx, AV_LOG_ERROR,
libavformat/rtpenc_chain.c+1−1
@@ -63,7 +63,7 @@ AVFormatContext *ff_rtp_chain_mux_open(AVFormatContext *s, AVStream *st, · 62 unmodified lines
6363 avio_close(rtpctx->pb);
6464 } else {
6565 uint8_t *ptr;
66− url_close_dyn_buf(rtpctx->pb, &ptr);
66+ avio_close_dyn_buf(rtpctx->pb, &ptr);
6767 av_free(ptr);
6868 }
6969 avformat_free_context(rtpctx);
libavformat/rtsp.c+1−1
@@ -495,7 +495,7 @@ void ff_rtsp_undo_setup(AVFormatContext *s) · 494 unmodified lines
495495 av_write_trailer(rtpctx);
496496 if (rt->lower_transport == RTSP_LOWER_TRANSPORT_TCP) {
497497 uint8_t *ptr;
498− url_close_dyn_buf(rtpctx->pb, &ptr);
498+ avio_close_dyn_buf(rtpctx->pb, &ptr);
499499 av_free(ptr);
500500 } else {
501501 avio_close(rtpctx->pb);
libavformat/rtspenc.c+1−1
@@ -135,7 +135,7 @@ static int tcp_write_packet(AVFormatContext *s, RTSPStream *rtsp_st) · 134 unmodified lines
135135 int size;
136136 uint8_t *interleave_header, *interleaved_packet;
137137
138− size = url_close_dyn_buf(rtpctx->pb, &buf);
138+ size = avio_close_dyn_buf(rtpctx->pb, &buf);
139139 ptr = buf;
140140 while (size > 4) {
141141 uint32_t packet_len = AV_RB32(ptr);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t