diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 18:29:21 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 18:29:21 +0000 |
| commit | 949d6dd51ce17c6ad62d257022ad9a75bc4cba73 (patch) | |
| tree | 5ff3bf07bab27a6243f40750bd9c2346e62c27e3 /libavformat | |
| parent | d97a6193c323a2da96fa470c5f08d4f70f9636c6 (diff) | |
| parent | 09f4822e4eaf61513b9092414450f3ae920ccd9d (diff) | |
| download | ffmpeg-949d6dd51ce17c6ad62d257022ad9a75bc4cba73.tar.gz | |
Merge commit '09f4822e4eaf61513b9092414450f3ae920ccd9d'
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/flvdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index d9bea917d7..8ca779d4b3 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -979,7 +979,8 @@ skip: // if not streamed and no duration from metadata then seek to end to find // the duration from the timestamps - if (s->pb->seekable && (!s->duration || s->duration == AV_NOPTS_VALUE) && !flv->searched_for_end) { + if (s->pb->seekable && (!s->duration || s->duration == AV_NOPTS_VALUE) && + !flv->searched_for_end) { int size; const int64_t pos = avio_tell(s->pb); // Read the last 4 bytes of the file, this should be the size of the |