summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libavformat/avformat.h22
-rw-r--r--libavformat/metadata.c2
-rw-r--r--libavformat/metadata.h2
-rw-r--r--libavformat/metadata_compat.c4
-rw-r--r--libavformat/mpegts.c2
-rw-r--r--libavformat/nutdec.c2
-rw-r--r--libavformat/options.c2
-rw-r--r--libavformat/utils.c12
8 files changed, 24 insertions, 24 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index f34e28ea7f..8bb4605202 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -35,11 +35,11 @@
#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
-#ifndef LAVF_API_MAX_STREAMS
-#define LAVF_API_MAX_STREAMS (LIBAVFORMAT_VERSION_MAJOR < 53)
+#ifndef FF_API_MAX_STREAMS
+#define FF_API_MAX_STREAMS (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif
-#ifndef LAVF_API_OLD_METADATA
-#define LAVF_API_OLD_METADATA (LIBAVFORMAT_VERSION_MAJOR < 53)
+#ifndef FF_API_OLD_METADATA
+#define FF_API_OLD_METADATA (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif
/**
@@ -147,7 +147,7 @@ typedef struct AVMetadataConv AVMetadataConv;
AVMetadataTag *
av_metadata_get(AVMetadata *m, const char *key, const AVMetadataTag *prev, int flags);
-#if LAVF_API_OLD_METADATA
+#if FF_API_OLD_METADATA
/**
* Set the given tag in *pm, overwriting an existing tag.
*
@@ -523,7 +523,7 @@ typedef struct AVStream {
*/
int64_t duration;
-#if LAVF_API_OLD_METADATA
+#if FF_API_OLD_METADATA
char language[4]; /**< ISO 639-2/B 3-letter language code (empty string if undefined) */
#endif
@@ -546,7 +546,7 @@ typedef struct AVStream {
int64_t unused[4+1];
#endif
-#if LAVF_API_OLD_METADATA
+#if FF_API_OLD_METADATA
char *filename; /**< source filename of the stream */
#endif
@@ -615,7 +615,7 @@ typedef struct AVStream {
*/
typedef struct AVProgram {
int id;
-#if LAVF_API_OLD_METADATA
+#if FF_API_OLD_METADATA
char *provider_name; ///< network name for DVB streams
char *name; ///< service name for DVB streams
#endif
@@ -633,13 +633,13 @@ 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 LAVF_API_OLD_METADATA
+#if FF_API_OLD_METADATA
char *title; ///< chapter title
#endif
AVMetadata *metadata;
} AVChapter;
-#if LAVF_API_MAX_STREAMS
+#if FF_API_MAX_STREAMS
#define MAX_STREAMS 20
#endif
@@ -662,7 +662,7 @@ typedef struct AVFormatContext {
char filename[1024]; /**< input or output filename */
/* stream info */
int64_t timestamp;
-#if LAVF_API_OLD_METADATA
+#if FF_API_OLD_METADATA
char title[512];
char author[512];
char copyright[512];
diff --git a/libavformat/metadata.c b/libavformat/metadata.c
index e6b0d54cf7..8fc1771956 100644
--- a/libavformat/metadata.c
+++ b/libavformat/metadata.c
@@ -86,7 +86,7 @@ int av_metadata_set2(AVMetadata **pm, const char *key, const char *value, int fl
return 0;
}
-#if LAVF_API_OLD_METADATA
+#if FF_API_OLD_METADATA
int av_metadata_set(AVMetadata **pm, const char *key, const char *value)
{
return av_metadata_set2(pm, key, value, 0);
diff --git a/libavformat/metadata.h b/libavformat/metadata.h
index 62c47a6976..3706bc409d 100644
--- a/libavformat/metadata.h
+++ b/libavformat/metadata.h
@@ -40,7 +40,7 @@ struct AVMetadataConv{
const char *generic;
};
-#if LAVF_API_OLD_METADATA
+#if FF_API_OLD_METADATA
void ff_metadata_demux_compat(AVFormatContext *s);
void ff_metadata_mux_compat(AVFormatContext *s);
#endif
diff --git a/libavformat/metadata_compat.c b/libavformat/metadata_compat.c
index 25afc46bc8..19b8f59df1 100644
--- a/libavformat/metadata_compat.c
+++ b/libavformat/metadata_compat.c
@@ -23,7 +23,7 @@
#include "metadata.h"
#include "libavutil/avstring.h"
-#if LAVF_API_OLD_METADATA
+#if FF_API_OLD_METADATA
#define SIZE_OFFSET(x) sizeof(((AVFormatContext*)0)->x),offsetof(AVFormatContext,x)
@@ -145,4 +145,4 @@ void ff_metadata_mux_compat(AVFormatContext *ctx)
}
}
-#endif /* LAVF_API_OLD_METADATA */
+#endif /* FF_API_OLD_METADATA */
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 89491498cf..d2f9f1eaf0 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -686,7 +686,7 @@ static int mpegts_push_data(MpegTSFilter *filter,
code == 0x1be) /* padding_stream */
goto skip;
-#if LAVF_API_MAX_STREAMS
+#if FF_API_MAX_STREAMS
if (!pes->st && pes->stream->nb_streams == MAX_STREAMS)
goto skip;
#endif
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index bdc216270c..fa1cb188d7 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -29,7 +29,7 @@
#undef NDEBUG
#include <assert.h>
-#if LAVF_API_MAX_STREAMS
+#if FF_API_MAX_STREAMS
#define NUT_MAX_STREAMS MAX_STREAMS
#else
#define NUT_MAX_STREAMS 256 /* arbitrary sanity check value */
diff --git a/libavformat/options.c b/libavformat/options.c
index acfb4226d6..28a49cb1da 100644
--- a/libavformat/options.c
+++ b/libavformat/options.c
@@ -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 LAVF_API_OLD_METADATA
+#if FF_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
diff --git a/libavformat/utils.c b/libavformat/utils.c
index c63e585b64..3fe5eaf635 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -457,7 +457,7 @@ int av_open_input_stream(AVFormatContext **ic_ptr,
if (pb && !ic->data_offset)
ic->data_offset = url_ftell(ic->pb);
-#if LAVF_API_OLD_METADATA
+#if FF_API_OLD_METADATA
ff_metadata_demux_compat(ic);
#endif
@@ -2460,14 +2460,14 @@ void av_close_input_stream(AVFormatContext *s)
av_free(st->index_entries);
av_free(st->codec->extradata);
av_free(st->codec);
-#if LAVF_API_OLD_METADATA
+#if FF_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 LAVF_API_OLD_METADATA
+#if FF_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(AVFormatContext *s)
flush_packet_queue(s);
av_freep(&s->priv_data);
while(s->nb_chapters--) {
-#if LAVF_API_OLD_METADATA
+#if FF_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(AVFormatContext *s, int id, AVRational time_base, int6
return NULL;
dynarray_add(&s->chapters, &s->nb_chapters, chapter);
}
-#if LAVF_API_OLD_METADATA
+#if FF_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 LAVF_API_OLD_METADATA
+#if FF_API_OLD_METADATA
ff_metadata_mux_compat(s);
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-06 11:12:16 +0000