[FFmpeg-cvslog] r24818 - in trunk/libavformat: avformat.h metadata.c metadata.h metadata_compat.c options.c utils.c
aurel
subversion
Tue Aug 17 22:23:19 CEST 2010
Author: aurel
Date: Tue Aug 17 22:23:19 2010
New Revision: 24818
Log:
add LAVF_API_OLD_METADATA define to disable the deprecated metadata API
Modified:
trunk/libavformat/avformat.h
trunk/libavformat/metadata.c
trunk/libavformat/metadata.h
trunk/libavformat/metadata_compat.c
trunk/libavformat/options.c
trunk/libavformat/utils.c
Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h Tue Aug 17 21:30:21 2010 (r24817)
+++ trunk/libavformat/avformat.h Tue Aug 17 22:23:19 2010 (r24818)
@@ -38,6 +38,9 @@
#ifndef LAVF_API_MAX_STREAMS
#define LAVF_API_MAX_STREAMS (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif
+#ifndef LAVF_API_OLD_METADATA
+#define LAVF_API_OLD_METADATA (LIBAVFORMAT_VERSION_MAJOR < 53)
+#endif
/**
* I return the LIBAVFORMAT_VERSION_INT constant. You got
@@ -144,7 +147,7 @@ typedef struct AVMetadataConv AVMetadata
AVMetadataTag *
av_metadata_get(AVMetadata *m, const char *key, const AVMetadataTag *prev, int flags);
-#if LIBAVFORMAT_VERSION_MAJOR == 52
+#if LAVF_API_OLD_METADATA
/**
* Set the given tag in *pm, overwriting an existing tag.
*
@@ -520,7 +523,7 @@ typedef struct AVStream {
*/
int64_t duration;
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
+#if LAVF_API_OLD_METADATA
char language[4]; /**< ISO 639-2/B 3-letter language code (empty string if undefined) */
#endif
@@ -541,7 +544,9 @@ typedef struct AVStream {
#if LIBAVFORMAT_VERSION_INT < (53<<16)
int64_t unused[4+1];
+#endif
+#if LAVF_API_OLD_METADATA
char *filename; /**< source filename of the stream */
#endif
@@ -610,7 +615,7 @@ typedef struct AVStream {
*/
typedef struct AVProgram {
int id;
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
+#if LAVF_API_OLD_METADATA
char *provider_name; ///< network name for DVB streams
char *name; ///< service name for DVB streams
#endif
@@ -628,7 +633,7 @@ 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)
+#if LAVF_API_OLD_METADATA
char *title; ///< chapter title
#endif
AVMetadata *metadata;
@@ -657,7 +662,7 @@ typedef struct AVFormatContext {
char filename[1024]; /**< input or output filename */
/* stream info */
int64_t timestamp;
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
+#if LAVF_API_OLD_METADATA
char title[512];
char author[512];
char copyright[512];
Modified: trunk/libavformat/metadata.c
==============================================================================
--- trunk/libavformat/metadata.c Tue Aug 17 21:30:21 2010 (r24817)
+++ trunk/libavformat/metadata.c Tue Aug 17 22:23:19 2010 (r24818)
@@ -86,7 +86,7 @@ int av_metadata_set2(AVMetadata **pm, co
return 0;
}
-#if LIBAVFORMAT_VERSION_MAJOR == 52
+#if LAVF_API_OLD_METADATA
int av_metadata_set(AVMetadata **pm, const char *key, const char *value)
{
return av_metadata_set2(pm, key, value, 0);
Modified: trunk/libavformat/metadata.h
==============================================================================
--- trunk/libavformat/metadata.h Tue Aug 17 21:30:21 2010 (r24817)
+++ trunk/libavformat/metadata.h Tue Aug 17 22:23:19 2010 (r24818)
@@ -40,7 +40,7 @@ struct AVMetadataConv{
const char *generic;
};
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if LAVF_API_OLD_METADATA
void ff_metadata_demux_compat(AVFormatContext *s);
void ff_metadata_mux_compat(AVFormatContext *s);
#endif
Modified: trunk/libavformat/metadata_compat.c
==============================================================================
--- trunk/libavformat/metadata_compat.c Tue Aug 17 21:30:21 2010 (r24817)
+++ trunk/libavformat/metadata_compat.c Tue Aug 17 22:23:19 2010 (r24818)
@@ -23,7 +23,7 @@
#include "metadata.h"
#include "libavutil/avstring.h"
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if LAVF_API_OLD_METADATA
#define SIZE_OFFSET(x) sizeof(((AVFormatContext*)0)->x),offsetof(AVFormatContext,x)
@@ -145,4 +145,4 @@ void ff_metadata_mux_compat(AVFormatCont
}
}
-#endif /* LIBAVFORMAT_VERSION_MAJOR < 53 */
+#endif /* LAVF_API_OLD_METADATA */
Modified: trunk/libavformat/options.c
==============================================================================
--- trunk/libavformat/options.c Tue Aug 17 21:30:21 2010 (r24817)
+++ trunk/libavformat/options.c Tue Aug 17 22:23:19 2010 (r24818)
@@ -50,7 +50,7 @@ static const AVOption options[]={
{"noparse", "disable AVParsers, this needs nofillin too", 0, FF_OPT_TYPE_CONST, AVFMT_FLAG_NOPARSE, INT_MIN, INT_MAX, D, "fflags"},
{"igndts", "ignore dts", 0, FF_OPT_TYPE_CONST, AVFMT_FLAG_IGNDTS, INT_MIN, INT_MAX, D, "fflags"},
{"rtphint", "add rtp hinting", 0, FF_OPT_TYPE_CONST, AVFMT_FLAG_RTP_HINT, INT_MIN, INT_MAX, E, "fflags"},
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
+#if LAVF_API_OLD_METADATA
{"track", " set the track number", OFFSET(track), FF_OPT_TYPE_INT, DEFAULT, 0, INT_MAX, E},
{"year", "set the year", OFFSET(year), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, E},
#endif
Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c Tue Aug 17 21:30:21 2010 (r24817)
+++ trunk/libavformat/utils.c Tue Aug 17 22:23:19 2010 (r24818)
@@ -457,7 +457,7 @@ int av_open_input_stream(AVFormatContext
if (pb && !ic->data_offset)
ic->data_offset = url_ftell(ic->pb);
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if LAVF_API_OLD_METADATA
ff_metadata_demux_compat(ic);
#endif
@@ -2460,14 +2460,14 @@ void av_close_input_stream(AVFormatConte
av_free(st->index_entries);
av_free(st->codec->extradata);
av_free(st->codec);
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
+#if LAVF_API_OLD_METADATA
av_free(st->filename);
#endif
av_free(st->priv_data);
av_free(st);
}
for(i=s->nb_programs-1; i>=0; i--) {
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
+#if LAVF_API_OLD_METADATA
av_freep(&s->programs[i]->provider_name);
av_freep(&s->programs[i]->name);
#endif
@@ -2479,7 +2479,7 @@ void av_close_input_stream(AVFormatConte
flush_packet_queue(s);
av_freep(&s->priv_data);
while(s->nb_chapters--) {
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
+#if LAVF_API_OLD_METADATA
av_free(s->chapters[s->nb_chapters]->title);
#endif
av_metadata_free(&s->chapters[s->nb_chapters]->metadata);
@@ -2582,7 +2582,7 @@ AVChapter *ff_new_chapter(AVFormatContex
return NULL;
dynarray_add(&s->chapters, &s->nb_chapters, chapter);
}
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
+#if LAVF_API_OLD_METADATA
av_free(chapter->title);
#endif
av_metadata_set2(&chapter->metadata, "title", title, 0);
@@ -2718,7 +2718,7 @@ int av_write_header(AVFormatContext *s)
return AVERROR(ENOMEM);
}
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if LAVF_API_OLD_METADATA
ff_metadata_mux_compat(s);
#endif
More information about the ffmpeg-cvslog
mailing list