openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-27 21:20:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avformat/mux: call deinit if write_header fails

Browse Source 
Docs clearly states that av_write_trailer should only be called if
avformat_write_header was successful, therefore we have to deinit if we return
failure.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2016-06-11 18:52:27 +02:00
parent 4bee44007a
commit 301ead1313
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/mux.c
View File

@ -485,14 +485,14 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options)
if (ret >= 0 && s->pb && s->pb->error < 0)
ret = s->pb->error;
if (ret < 0)
return ret;
goto fail;
if (s->flush_packets && s->pb && s->pb->error >= 0 && s->flags & AVFMT_FLAG_FLUSH_PACKETS)
avio_flush(s->pb);
s->internal->header_written = 1;
}
if ((ret = init_pts(s)) < 0)
return ret;
goto fail;
if (s->avoid_negative_ts < 0) {
av_assert2(s->avoid_negative_ts == AVFMT_AVOID_NEG_TS_AUTO);
@ -503,6 +503,11 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options)
}
return 0;
fail:
if (s->oformat->deinit)
s->oformat->deinit(s);
return ret;
}
#define AV_PKT_FLAG_UNCODED_FRAME 0x2000