virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

Merge commit '83548fe894cdb455cc127f754d09905b6d23c173'

Browse Source 
* commit '83548fe894cdb455cc127f754d09905b6d23c173':
  lavf: fix usage of AVIOContext.seekable

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2017-03-21 17:02:30 -03:00
parent 423375d4f0 83548fe894
commit 4de591e6fb
65 changed files with 134 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/tty.c
View File

@@ -94,7 +94,7 @@ static int read_header(AVFormatContext *avctx)
/* simulate tty display speed */
s->chars_per_frame = FFMAX(av_q2d(st->time_base)*s->chars_per_frame, 1);
if (avctx->pb->seekable) {
if (avctx->pb->seekable & AVIO_SEEKABLE_NORMAL) {
s->fsize = avio_size(avctx->pb);
st->duration = (s->fsize + s->chars_per_frame - 1) / s->chars_per_frame;