highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'db7968bff4851c2be79b15b2cb2ae747424d2fca'

Browse Source 
* commit 'db7968bff4851c2be79b15b2cb2ae747424d2fca':
  avio: Allow custom IO users to get labels for the output bytestream

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
This commit is contained in:
Matthieu Bouron
2016-06-23 15:27:00 +02:00
parent 55816c9269 db7968bff4
commit 5d75e46677
5 changed files with 129 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/mux.c
View File

@@ -475,6 +475,8 @@ static int init_pts(AVFormatContext *s)
static int write_header_internal(AVFormatContext *s)
{
if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb)
avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_HEADER);
if (s->oformat->write_header) {
int ret = s->oformat->write_header(s);
if (ret >= 0 && s->pb && s->pb->error < 0)
@@ -486,6 +488,8 @@ static int write_header_internal(AVFormatContext *s)
avio_flush(s->pb);
}
s->internal->header_written = 1;
if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb)
avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_UNKNOWN);
return 0;
}
@@ -1164,12 +1168,15 @@ int av_write_trailer(AVFormatContext *s)
}
fail:
if (s->internal->header_written && s->oformat->write_trailer)
if (s->internal->header_written && s->oformat->write_trailer) {
if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb)
avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_TRAILER);
if (ret >= 0) {
ret = s->oformat->write_trailer(s);
} else {
s->oformat->write_trailer(s);
}
}
if (s->oformat->deinit)
s->oformat->deinit(s);