diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-03-01 16:35:25 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-03-01 16:35:25 +0000 |
| commit | 827f7e285ba1d0090f8c39770a5669373a132fad (patch) | |
| tree | 63d195a97174f80a9f5336a4209a04e0386d776c /libavformat/avformat.h | |
| parent | bc718b4720fbde0eda767ec3fdf34cb216261291 (diff) | |
| download | ffmpeg-827f7e285ba1d0090f8c39770a5669373a132fad.tar.gz | |
deprecate old metadata API
Originally committed as revision 17690 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index df532519a3..18ec2c86f9 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -475,7 +475,9 @@ typedef struct AVStream { */ int64_t duration; +#if LIBAVFORMAT_VERSION_INT < (53<<16) char language[4]; /** ISO 639 3-letter language code (empty string if undefined) */ +#endif /* av_read_frame() support */ enum AVStreamParseType need_parsing; @@ -494,9 +496,9 @@ typedef struct AVStream { #if LIBAVFORMAT_VERSION_INT < (53<<16) int64_t unused[4+1]; -#endif char *filename; /**< source filename of the stream */ +#endif int disposition; /**< AV_DISPOSITION_* bit field */ @@ -539,8 +541,10 @@ typedef struct AVStream { */ typedef struct AVProgram { int id; +#if LIBAVFORMAT_VERSION_INT < (53<<16) char *provider_name; ///< network name for DVB streams char *name; ///< service name for DVB streams +#endif int flags; enum AVDiscard discard; ///< selects which program to discard and which to feed to the caller unsigned int *stream_index; @@ -555,7 +559,9 @@ typedef struct AVChapter { int id; ///< unique ID to identify the chapter AVRational time_base; ///< time base in which the start/end timestamps are specified int64_t start, end; ///< chapter start/end time in time_base units +#if LIBAVFORMAT_VERSION_INT < (53<<16) char *title; ///< chapter title +#endif AVMetadata *metadata; } AVChapter; @@ -580,6 +586,7 @@ typedef struct AVFormatContext { char filename[1024]; /**< input or output filename */ /* stream info */ int64_t timestamp; +#if LIBAVFORMAT_VERSION_INT < (53<<16) char title[512]; char author[512]; char copyright[512]; @@ -588,6 +595,7 @@ typedef struct AVFormatContext { int year; /**< ID3 year, 0 if none */ int track; /**< track number, 0 if none */ char genre[32]; /**< ID3 genre */ +#endif int ctx_flags; /**< Format-specific flags, see AVFMTCTX_xx */ /* private data for pts handling (do not modify directly). */ |