mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-30 14:40:32 +00:00
Merge commit '62572435d4106098c090fb8f129a9090e41ff1eb'
* commit '62572435d4106098c090fb8f129a9090e41ff1eb': rtpenc_chain: Check for errors from ffio_fdopen and ffio_open_dyn_packet_buf Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
6bf6d6ad49
@ -78,16 +78,19 @@ int ff_rtp_chain_mux_open(AVFormatContext **out, AVFormatContext *s,
|
||||
avcodec_copy_context(rtpctx->streams[0]->codec, st->codec);
|
||||
|
||||
if (handle) {
|
||||
ffio_fdopen(&rtpctx->pb, handle);
|
||||
ret = ffio_fdopen(&rtpctx->pb, handle);
|
||||
if (ret < 0)
|
||||
ffurl_close(handle);
|
||||
} else
|
||||
ffio_open_dyn_packet_buf(&rtpctx->pb, packet_size);
|
||||
ret = avformat_write_header(rtpctx, &opts);
|
||||
ret = ffio_open_dyn_packet_buf(&rtpctx->pb, packet_size);
|
||||
if (!ret)
|
||||
ret = avformat_write_header(rtpctx, &opts);
|
||||
av_dict_free(&opts);
|
||||
|
||||
if (ret) {
|
||||
if (handle) {
|
||||
if (handle && rtpctx->pb) {
|
||||
avio_close(rtpctx->pb);
|
||||
} else {
|
||||
} else if (rtpctx->pb) {
|
||||
uint8_t *ptr;
|
||||
avio_close_dyn_buf(rtpctx->pb, &ptr);
|
||||
av_free(ptr);
|
||||
|
Loading…
Reference in New Issue
Block a user