diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-04 16:58:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-04 17:10:48 +0200 |
| commit | 30db867cb7be54fd8e756640b4e18cb20a70a64a (patch) | |
| tree | 9ee4a1cde3d846a3704ac25a21d34d576c6b3757 /libavformat/concatdec.c | |
| parent | c7a7605656633e52ade8a5d32a7c2497b37faef8 (diff) | |
| parent | fa245e432bdc3b28081d8fcaa90dced6c6fbf566 (diff) | |
| download | ffmpeg-30db867cb7be54fd8e756640b4e18cb20a70a64a.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavf/matroskaenc: return an error for unsupported types.
lavf/concatdec: remove invalid check for AVSEEK_FLAG_BACKWARD.
lavf: filter out AVSEEK_FLAG_BACKWARD in new API.
lavf: call the new seek API from the old.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/concatdec.c')
| -rw-r--r-- | libavformat/concatdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 5359ad149d..78362e2c65 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -341,7 +341,7 @@ static int real_seek(AVFormatContext *avf, int stream, return ret; ret = try_seek(avf, stream, min_ts, ts, max_ts, flags); - if (ret < 0 && !(flags & AVSEEK_FLAG_BACKWARD) && + if (ret < 0 && left < cat->nb_files - 1 && cat->files[left + 1].start_time < max_ts) { if ((ret = open_file(avf, left + 1)) < 0) |