har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/concatdec: always allow seeking to start

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2018-12-13 22:13:09 +01:00
parent f9e947845f
commit 7f42276aa9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/concatdec.c
View File

@ -692,6 +692,13 @@ static int real_seek(AVFormatContext *avf, int stream,
left = 0; left = 0;
right = cat->nb_files; right = cat->nb_files;
/* Always support seek to start */
if (ts <= 0)
right = 1;
else if (!cat->seekable)
return AVERROR(ESPIPE); /* XXX: can we use it? */
while (right - left > 1) { while (right - left > 1) {
int mid = (left + right) / 2; int mid = (left + right) / 2;
if (ts < cat->files[mid].start_time) if (ts < cat->files[mid].start_time)
@ -728,8 +735,6 @@ static int concat_seek(AVFormatContext *avf, int stream,
AVFormatContext *cur_avf_saved = cat->avf; AVFormatContext *cur_avf_saved = cat->avf;
int ret; int ret;
if (!cat->seekable)
return AVERROR(ESPIPE); /* XXX: can we use it? */
if (flags & (AVSEEK_FLAG_BYTE | AVSEEK_FLAG_FRAME)) if (flags & (AVSEEK_FLAG_BYTE | AVSEEK_FLAG_FRAME))
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
cat->avf = NULL; cat->avf = NULL;