X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fsapdec.c;h=218c32a2ebd6e360910b2c3707a812422cffabc4;hb=6372c9dc9972318e75a5889ad6c52500b8294099;hp=926795b6a9dd2a263a8bbe5785c7961ed012fa8a;hpb=04e4166536d3fb51ee9b9361de2a414fa876ab6e;p=ffmpeg diff --git a/libavformat/sapdec.c b/libavformat/sapdec.c index 926795b6a9d..218c32a2ebd 100644 --- a/libavformat/sapdec.c +++ b/libavformat/sapdec.c @@ -87,7 +87,7 @@ static int sap_read_header(AVFormatContext *s) port); ret = ffurl_open_whitelist(&sap->ann_fd, url, AVIO_FLAG_READ, &s->interrupt_callback, NULL, - s->protocol_whitelist); + s->protocol_whitelist, s->protocol_blacklist); if (ret) goto fail; @@ -161,7 +161,7 @@ static int sap_read_header(AVFormatContext *s) sap->sdp_ctx->pb = &sap->sdp_pb; sap->sdp_ctx->interrupt_callback = s->interrupt_callback; - if ((ret = ff_copy_whitelists(sap->sdp_ctx, s)) < 0) + if ((ret = ff_copy_whiteblacklists(sap->sdp_ctx, s)) < 0) goto fail; ret = avformat_open_input(&sap->sdp_ctx, "temp.sdp", infmt, NULL); @@ -176,7 +176,7 @@ static int sap_read_header(AVFormatContext *s) goto fail; } st->id = i; - avcodec_copy_context(st->codec, sap->sdp_ctx->streams[i]->codec); + avcodec_parameters_copy(st->codecpar, sap->sdp_ctx->streams[i]->codecpar); st->time_base = sap->sdp_ctx->streams[i]->time_base; } @@ -225,7 +225,7 @@ static int sap_fetch_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR(ENOMEM); } st->id = i; - avcodec_copy_context(st->codec, sap->sdp_ctx->streams[i]->codec); + avcodec_parameters_copy(st->codecpar, sap->sdp_ctx->streams[i]->codecpar); st->time_base = sap->sdp_ctx->streams[i]->time_base; } }