OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
be28ce2
)
lavf/matroskaenc: don't try to modify the header when live-streaming
author
Rodger Combs
<rodger.combs@gmail.com>
Thu, 27 Oct 2016 06:10:47 +0000
(
01:10
-0500)
committer
Rodger Combs
<rodger.combs@gmail.com>
Wed, 2 Nov 2016 06:16:26 +0000
(
01:16
-0500)
libavformat/matroskaenc.c
patch
|
blob
|
history
diff --git
a/libavformat/matroskaenc.c
b/libavformat/matroskaenc.c
index
56174ff
..
78540fb
100644
(file)
--- a/
libavformat/matroskaenc.c
+++ b/
libavformat/matroskaenc.c
@@
-1783,7
+1783,7
@@
static int mkv_write_header(AVFormatContext *s)
put_ebml_void(pb, 11); // assumes double-precision float to be written
}
}
- if (s->pb->seekable)
+ if (s->pb->seekable
&& !mkv->is_live
)
put_ebml_void(s->pb, avio_tell(pb));
else
end_ebml_master_crc32(s->pb, &mkv->info_bc, mkv, mkv->info);
@@
-2274,7
+2274,7
@@
static int mkv_write_trailer(AVFormatContext *s)
return ret;
}
- if (pb->seekable) {
+ if (pb->seekable
&& !mkv->is_live
) {
if (mkv->cues->num_entries) {
if (mkv->reserve_cues_space) {
int64_t cues_end;