Browse Source

lavf: undeprecate read_seek().

The "new seeking API" was never finished and nobody is working on it.
tags/n0.10
Anton Khirnov 13 years ago
parent
commit
e5c708151e
2 changed files with 3 additions and 7 deletions
  1. +3
    -4
      libavformat/avformat.h
  2. +0
    -3
      libavformat/version.h

+ 3
- 4
libavformat/avformat.h View File

@@ -503,7 +503,6 @@ typedef struct AVInputFormat {
*/ */
int (*read_close)(struct AVFormatContext *); int (*read_close)(struct AVFormatContext *);


#if FF_API_READ_SEEK
/** /**
* Seek to a given timestamp relative to the frames in * Seek to a given timestamp relative to the frames in
* stream component stream_index. * stream component stream_index.
@@ -512,9 +511,9 @@ typedef struct AVInputFormat {
* match is available. * match is available.
* @return >= 0 on success (but not necessarily the new offset) * @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. * Get the next timestamp in stream[stream_index].time_base units.
* @return the timestamp or AV_NOPTS_VALUE if an error occurred * @return the timestamp or AV_NOPTS_VALUE if an error occurred


+ 0
- 3
libavformat/version.h View File

@@ -50,9 +50,6 @@
#ifndef FF_API_OLD_METADATA2 #ifndef FF_API_OLD_METADATA2
#define FF_API_OLD_METADATA2 (LIBAVFORMAT_VERSION_MAJOR < 54) #define FF_API_OLD_METADATA2 (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif #endif
#ifndef FF_API_READ_SEEK
#define FF_API_READ_SEEK (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_OLD_AVIO #ifndef FF_API_OLD_AVIO
#define FF_API_OLD_AVIO (LIBAVFORMAT_VERSION_MAJOR < 54) #define FF_API_OLD_AVIO (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif #endif


Loading…
Cancel
Save