This temporarily (until 0.8 is released) reverts commit 8e1340abc316e038bb89e5a3b46e92ff58c98a88. That commit breaks shared builds because of symbol hiding. Reverting it will enable shared builds for 0.8
Showing the changes to avserver.c (1 of 1 file). Show all
Unified · Split
| @@ -26,16 +26,13 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <string.h> |
| 27 | 27 | #include <stdlib.h> |
| 28 | 28 | #include "libavformat/avformat.h" |
| 29 | −// FIXME those are internal headers, avserver _really_ shouldn't use them | |
| 30 | 29 | #include "libavformat/ffm.h" |
| 31 | 30 | #include "libavformat/network.h" |
| 32 | 31 | #include "libavformat/os_support.h" |
| 33 | 32 | #include "libavformat/rtpdec.h" |
| 34 | 33 | #include "libavformat/rtsp.h" |
| 34 | +// XXX for ffio_open_dyn_packet_buffer, to be removed | |
| 35 | 35 | #include "libavformat/avio_internal.h" |
| 36 | −#include "libavformat/internal.h" | |
| 37 | −#include "libavformat/url.h" | |
| 38 | − | |
| 39 | 36 | #include "libavutil/avstring.h" |
| 40 | 37 | #include "libavutil/lfg.h" |
| 41 | 38 | #include "libavutil/dict.h" |
| @@ -870,7 +867,7 @@ static void close_connection(HTTPContext *c) · 828 unmodified lines | ||
| 870 | 867 | } |
| 871 | 868 | h = c->rtp_handles[i]; |
| 872 | 869 | if (h) |
| 873 | − ffurl_close(h); | |
| 870 | + url_close(h); | |
| 874 | 871 | } |
| 875 | 872 | |
| 876 | 873 | ctx = &c->fmt_ctx; |
| @@ -2251,6 +2248,7 @@ static int http_prepare_data(HTTPContext *c) · 1374 unmodified lines | ||
| 2251 | 2248 | * Default value from Libav |
| 2252 | 2249 | * Try to set it use configuration option |
| 2253 | 2250 | */ |
| 2251 | + c->fmt_ctx.preload = (int)(0.5*AV_TIME_BASE); | |
| 2254 | 2252 | c->fmt_ctx.max_delay = (int)(0.7*AV_TIME_BASE); |
| 2255 | 2253 | |
| 2256 | 2254 | if (avformat_write_header(&c->fmt_ctx, NULL) < 0) { |
| @@ -2369,7 +2367,7 @@ static int http_prepare_data(HTTPContext *c) · 112 unmodified lines | ||
| 2369 | 2367 | if (c->rtp_protocol == RTSP_LOWER_TRANSPORT_TCP) |
| 2370 | 2368 | max_packet_size = RTSP_TCP_MAX_PACKET_SIZE; |
| 2371 | 2369 | else |
| 2372 | − max_packet_size = c->rtp_handles[c->packet_stream_index]->max_packet_size; | |
| 2370 | + max_packet_size = url_get_max_packet_size(c->rtp_handles[c->packet_stream_index]); | |
| 2373 | 2371 | ret = ffio_open_dyn_packet_buf(&ctx->pb, max_packet_size); |
| 2374 | 2372 | } else { |
| 2375 | 2373 | ret = avio_open_dyn_buf(&ctx->pb); |
| @@ -2522,8 +2520,8 @@ static int http_send_data(HTTPContext *c) · 146 unmodified lines | ||
| 2522 | 2520 | } else { |
| 2523 | 2521 | /* send RTP packet directly in UDP */ |
| 2524 | 2522 | c->buffer_ptr += 4; |
| 2525 | − ffurl_write(c->rtp_handles[c->packet_stream_index], | |
| 2526 | − c->buffer_ptr, len); | |
| 2523 | + url_write(c->rtp_handles[c->packet_stream_index], | |
| 2524 | + c->buffer_ptr, len); | |
| 2527 | 2525 | c->buffer_ptr += len; |
| 2528 | 2526 | /* here we continue as we can send several packets per 10 ms slot */ |
| 2529 | 2527 | } |
| @@ -3406,10 +3404,10 @@ static int rtp_new_av_stream(HTTPContext *c, · 876 unmodified lines | ||
| 3406 | 3404 | "rtp://%s:%d", ipaddr, ntohs(dest_addr->sin_port)); |
| 3407 | 3405 | } |
| 3408 | 3406 | |
| 3409 | − if (ffurl_open(&h, ctx->filename, AVIO_FLAG_WRITE, NULL, NULL) < 0) | |
| 3407 | + if (url_open(&h, ctx->filename, AVIO_FLAG_WRITE) < 0) | |
| 3410 | 3408 | goto fail; |
| 3411 | 3409 | c->rtp_handles[stream_index] = h; |
| 3412 | − max_packet_size = h->max_packet_size; | |
| 3410 | + max_packet_size = url_get_max_packet_size(h); | |
| 3413 | 3411 | break; |
| 3414 | 3412 | case RTSP_LOWER_TRANSPORT_TCP: |
| 3415 | 3413 | /* RTP/TCP case */ |
| @@ -3432,7 +3430,7 @@ static int rtp_new_av_stream(HTTPContext *c, · 16 unmodified lines | ||
| 3432 | 3430 | if (avformat_write_header(ctx, NULL) < 0) { |
| 3433 | 3431 | fail: |
| 3434 | 3432 | if (h) |
| 3435 | − ffurl_close(h); | |
| 3433 | + url_close(h); | |
| 3436 | 3434 | av_free(ctx); |
| 3437 | 3435 | return -1; |
| 3438 | 3436 | } |
| @@ -3469,7 +3467,7 @@ static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec, int cop · 30 unmodified lines | ||
| 3469 | 3467 | } |
| 3470 | 3468 | fst->priv_data = av_mallocz(sizeof(FeedData)); |
| 3471 | 3469 | fst->index = stream->nb_streams; |
| 3472 | − avpriv_set_pts_info(fst, 33, 1, 90000); | |
| 3470 | + av_set_pts_info(fst, 33, 1, 90000); | |
| 3473 | 3471 | fst->sample_aspect_ratio = codec->sample_aspect_ratio; |
| 3474 | 3472 | stream->streams[stream->nb_streams++] = fst; |
| 3475 | 3473 | return fst; |