diff options
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 6f7b6a5116..f3e4fe4842 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -133,20 +133,6 @@ typedef struct AVMetadataConv AVMetadataConv; AVMetadataTag * av_metadata_get(AVMetadata *m, const char *key, const AVMetadataTag *prev, int flags); -#if FF_API_OLD_METADATA -/** - * Set the given tag in *pm, overwriting an existing tag. - * - * @param pm pointer to a pointer to a metadata struct. If *pm is NULL - * a metadata struct is allocated and put in *pm. - * @param key tag key to add to *pm (will be av_strduped) - * @param value tag value to add to *pm (will be av_strduped) - * @return >= 0 on success otherwise an error code <0 - * @deprecated Use av_metadata_set2() instead. - */ -attribute_deprecated int av_metadata_set(AVMetadata **pm, const char *key, const char *value); -#endif - /** * Set the given tag in *pm, overwriting an existing tag. * @@ -544,10 +530,6 @@ typedef struct AVStream { */ int64_t duration; -#if FF_API_OLD_METADATA - attribute_deprecated char language[4]; /**< ISO 639-2/B 3-letter language code (empty string if undefined) */ -#endif - /* av_read_frame() support */ enum AVStreamParseType need_parsing; struct AVCodecParserContext *parser; @@ -567,10 +549,6 @@ typedef struct AVStream { attribute_deprecated int64_t unused[4+1]; #endif -#if FF_API_OLD_METADATA - attribute_deprecated char *filename; /**< source filename of the stream */ -#endif - int disposition; /**< AV_DISPOSITION_* bit field */ AVProbeData probe_data; @@ -648,10 +626,6 @@ typedef struct AVStream { */ typedef struct AVProgram { int id; -#if FF_API_OLD_METADATA - attribute_deprecated char *provider_name; ///< network name for DVB streams - attribute_deprecated 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; @@ -666,9 +640,6 @@ 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 FF_API_OLD_METADATA - attribute_deprecated char *title; ///< chapter title -#endif AVMetadata *metadata; } AVChapter; @@ -691,16 +662,6 @@ typedef struct AVFormatContext { char filename[1024]; /**< input or output filename */ /* stream info */ int64_t timestamp; -#if FF_API_OLD_METADATA - attribute_deprecated char title[512]; - attribute_deprecated char author[512]; - attribute_deprecated char copyright[512]; - attribute_deprecated char comment[512]; - attribute_deprecated char album[512]; - attribute_deprecated int year; /**< ID3 year, 0 if none */ - attribute_deprecated int track; /**< track number, 0 if none */ - attribute_deprecated char genre[32]; /**< ID3 genre */ -#endif int ctx_flags; /**< Format-specific flags, see AVFMTCTX_xx */ /* private data for pts handling (do not modify directly). */ |