AVDictionary *opts = NULL;
int len = strlen(p) * 6 / 8;
char *buf = av_mallocz(len);
+
+ if (!buf)
+ return AVERROR(ENOMEM);
av_base64_decode(buf, p, len);
if (rtp_asf_fix_header(buf, len) < 0)
if (rt->asf_ctx) {
avformat_close_input(&rt->asf_ctx);
}
- if (!(rt->asf_ctx = avformat_alloc_context()))
+ rt->asf_ctx = avformat_alloc_context();
+ if (!rt->asf_ctx) {
+ av_free(buf);
return AVERROR(ENOMEM);
+ }
rt->asf_ctx->pb = &pb;
av_dict_set(&opts, "no_resync_search", "1", 0);
ret = avformat_open_input(&rt->asf_ctx, "", &ff_asf_demuxer, &opts);
av_dict_free(&opts);
- if (ret < 0)
+ if (ret < 0) {
+ av_free(buf);
return ret;
+ }
av_dict_copy(&s->metadata, rt->asf_ctx->metadata, 0);
rt->asf_pb_pos = avio_tell(&pb);
av_free(buf);
for (i = 0; i < rt->asf_ctx->nb_streams; i++) {
if (s->streams[stream_index]->id == rt->asf_ctx->streams[i]->id) {
- *s->streams[stream_index]->codec =
- *rt->asf_ctx->streams[i]->codec;
+ avcodec_parameters_copy(s->streams[stream_index]->codecpar,
+ rt->asf_ctx->streams[i]->codecpar);
s->streams[stream_index]->need_parsing =
rt->asf_ctx->streams[i]->need_parsing;
- rt->asf_ctx->streams[i]->codec->extradata_size = 0;
- rt->asf_ctx->streams[i]->codec->extradata = NULL;
avpriv_set_pts_info(s->streams[stream_index], 32, 1, 1000);
}
}
int start_off = avio_tell(pb);
mflags = avio_r8(pb);
- if (mflags & 0x80)
- flags |= RTP_FLAG_KEY;
len_off = avio_rb24(pb);
if (mflags & 0x20) /**< relative timestamp */
avio_skip(pb, 4);
* multiple RTP packets.
*/
if (asf->pktbuf && len_off != avio_tell(asf->pktbuf)) {
- uint8_t *p;
- avio_close_dyn_buf(asf->pktbuf, &p);
- asf->pktbuf = NULL;
- av_free(p);
+ ffio_free_dyn_buf(&asf->pktbuf);
}
if (!len_off && !asf->pktbuf &&
(res = avio_open_dyn_buf(&asf->pktbuf)) < 0)
return 1; // FIXME: return 0 if last packet
}
}
- av_free_packet(pkt);
+ av_packet_unref(pkt);
}
return res == 1 ? -1 : res;
}
-static void asfrtp_free_context(PayloadContext *asf)
+static void asfrtp_close_context(PayloadContext *asf)
{
- if (asf->pktbuf) {
- uint8_t *p = NULL;
- avio_close_dyn_buf(asf->pktbuf, &p);
- asf->pktbuf = NULL;
- av_free(p);
- }
+ ffio_free_dyn_buf(&asf->pktbuf);
av_freep(&asf->buf);
- av_free(asf);
}
#define RTP_ASF_HANDLER(n, s, t) \
.codec_id = AV_CODEC_ID_NONE, \
.priv_data_size = sizeof(PayloadContext), \
.parse_sdp_a_line = asfrtp_parse_sdp_line, \
- .free = asfrtp_free_context, \
+ .close = asfrtp_close_context, \
.parse_packet = asfrtp_parse_packet, \
}