virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat/mux: do not call write_header multiple times if it fails the first time

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2016-06-11 20:18:40 +02:00
parent b577d42183
commit 517fe64406
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/internal.h
View File

@ -124,6 +124,7 @@ struct AVFormatInternal {
* Whether or not a header has already been written
*/
int header_written;
int write_header_ret;
};
struct AVStreamInternal {

5
libavformat/mux.c
View File

@ -479,6 +479,7 @@ static int write_header_internal(AVFormatContext *s)
int ret = s->oformat->write_header(s);
if (ret >= 0 && s->pb && s->pb->error < 0)
ret = s->pb->error;
s->internal->write_header_ret = ret;
if (ret < 0)
return ret;
if (s->flush_packets && s->pb && s->pb->error >= 0 && s->flags & AVFMT_FLAG_FLUSH_PACKETS)
@ -713,7 +714,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
did_split = av_packet_split_side_data(pkt);
if (!s->internal->header_written) {
ret = write_header_internal(s);
ret = s->internal->write_header_ret ? s->internal->write_header_ret : write_header_internal(s);
if (ret < 0)
goto fail;
}
@ -1152,7 +1153,7 @@ int av_write_trailer(AVFormatContext *s)
}
if (!s->internal->header_written) {
ret = write_header_internal(s);
ret = s->internal->write_header_ret ? s->internal->write_header_ret : write_header_internal(s);
if (ret < 0)
goto fail;
}