diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-01-12 09:36:11 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-01-12 18:18:23 +0100 |
| commit | e5c708151e3dbf09c9564051c432b1b83a1674d0 (patch) | |
| tree | 43f3e41f5c32cfa89f0f28e25e18e3e3de2877f9 | |
| parent | e01a29a461ec15aad745fa89e510a92918d872aa (diff) | |
| download | ffmpeg-e5c708151e3dbf09c9564051c432b1b83a1674d0.tar.gz | |
lavf: undeprecate read_seek().
The "new seeking API" was never finished and nobody is working on it.
| -rw-r--r-- | libavformat/avformat.h | 7 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 89b9eda4a4..fff911a483 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -503,7 +503,6 @@ typedef struct AVInputFormat { */ int (*read_close)(struct AVFormatContext *); -#if FF_API_READ_SEEK /** * Seek to a given timestamp relative to the frames in * stream component stream_index. @@ -512,9 +511,9 @@ typedef struct AVInputFormat { * match is available. * @return >= 0 on success (but not necessarily the new offset) */ - attribute_deprecated int (*read_seek)(struct AVFormatContext *, - int stream_index, int64_t timestamp, int flags); -#endif + int (*read_seek)(struct AVFormatContext *, + int stream_index, int64_t timestamp, int flags); + /** * Get the next timestamp in stream[stream_index].time_base units. * @return the timestamp or AV_NOPTS_VALUE if an error occurred diff --git a/libavformat/version.h b/libavformat/version.h index e113a24482..fb5a1eb9db 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -50,9 +50,6 @@ #ifndef FF_API_OLD_METADATA2 #define FF_API_OLD_METADATA2 (LIBAVFORMAT_VERSION_MAJOR < 54) #endif -#ifndef FF_API_READ_SEEK -#define FF_API_READ_SEEK (LIBAVFORMAT_VERSION_MAJOR < 54) -#endif #ifndef FF_API_OLD_AVIO #define FF_API_OLD_AVIO (LIBAVFORMAT_VERSION_MAJOR < 54) #endif |