[FFmpeg-cvslog] lavf: undeprecate read_seek().

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Jan 12 09:36:11 2012 +0100| [e5c708151e3dbf09c9564051c432b1b83a1674d0] | committer: Anton Khirnov

lavf: undeprecate read_seek().

The "new seeking API" was never finished and nobody is working on it.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e5c708151e3dbf09c9564051c432b1b83a1674d0
---

 libavformat/avformat.h |    7 +++----
 libavformat/version.h  |    3 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 89b9eda..fff911a 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 e113a24..fb5a1eb 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