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/avformat.h | |
| 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/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index f21dd90305..a9ea1d8e1f 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1687,6 +1687,7 @@ int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp, * or if stream_index is -1, in AV_TIME_BASE units. * If flags contain AVSEEK_FLAG_ANY, then non-keyframes are treated as * keyframes (this may not be supported by all demuxers). + * If flags contain AVSEEK_FLAG_BACKWARD, it is ignored. * * @param stream_index index of the stream which is used as time base reference * @param min_ts smallest acceptable timestamp |