History

rename LAVF_API_* defines to FF_API_* to clarify that it is not public API

Originally committed as revision 24825 to svn://svn.ffmpeg.org/ffmpeg/trunk

Aurelien Jacobs committed 16 years ago

Commit 54036be1 parent a42c29f8 files · +24 −24Browse files

Unified · Split

8 files
  1. libavformat/avformat.h +11 −11
  2. libavformat/metadata.c +1 −1
  3. libavformat/metadata.h +1 −1
  4. libavformat/metadata_compat.c +2 −2
  5. libavformat/mpegts.c +1 −1
  6. libavformat/nutdec.c +1 −1
  7. libavformat/options.c +1 −1
  8. libavformat/utils.c +6 −6
libavformat/avformat.h+11−11
@@ -35,11 +35,11 @@ · 34 unmodified lines
3535
3636 #define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
3737
38−#ifndef LAVF_API_MAX_STREAMS
39−#define LAVF_API_MAX_STREAMS (LIBAVFORMAT_VERSION_MAJOR < 53)
38+#ifndef FF_API_MAX_STREAMS
39+#define FF_API_MAX_STREAMS (LIBAVFORMAT_VERSION_MAJOR < 53)
4040 #endif
41−#ifndef LAVF_API_OLD_METADATA
42−#define LAVF_API_OLD_METADATA (LIBAVFORMAT_VERSION_MAJOR < 53)
41+#ifndef FF_API_OLD_METADATA
42+#define FF_API_OLD_METADATA (LIBAVFORMAT_VERSION_MAJOR < 53)
4343 #endif
4444
4545 /**
@@ -147,7 +147,7 @@ typedef struct AVMetadataConv AVMetadataConv; · 101 unmodified lines
147147 AVMetadataTag *
148148 av_metadata_get(AVMetadata *m, const char *key, const AVMetadataTag *prev, int flags);
149149
150−#if LAVF_API_OLD_METADATA
150+#if FF_API_OLD_METADATA
151151 /**
152152 * Set the given tag in *pm, overwriting an existing tag.
153153 *
@@ -523,7 +523,7 @@ typedef struct AVStream { · 369 unmodified lines
523523 */
524524 int64_t duration;
525525
526−#if LAVF_API_OLD_METADATA
526+#if FF_API_OLD_METADATA
527527 char language[4]; /**< ISO 639-2/B 3-letter language code (empty string if undefined) */
528528 #endif
529529
@@ -546,7 +546,7 @@ typedef struct AVStream { · 16 unmodified lines
546546 int64_t unused[4+1];
547547 #endif
548548
549−#if LAVF_API_OLD_METADATA
549+#if FF_API_OLD_METADATA
550550 char *filename; /**< source filename of the stream */
551551 #endif
552552
@@ -615,7 +615,7 @@ typedef struct AVStream { · 62 unmodified lines
615615 */
616616 typedef struct AVProgram {
617617 int id;
618−#if LAVF_API_OLD_METADATA
618+#if FF_API_OLD_METADATA
619619 char *provider_name; ///< network name for DVB streams
620620 char *name; ///< service name for DVB streams
621621 #endif
@@ -633,13 +633,13 @@ typedef struct AVChapter { · 11 unmodified lines
633633 int id; ///< unique ID to identify the chapter
634634 AVRational time_base; ///< time base in which the start/end timestamps are specified
635635 int64_t start, end; ///< chapter start/end time in time_base units
636−#if LAVF_API_OLD_METADATA
636+#if FF_API_OLD_METADATA
637637 char *title; ///< chapter title
638638 #endif
639639 AVMetadata *metadata;
640640 } AVChapter;
641641
642−#if LAVF_API_MAX_STREAMS
642+#if FF_API_MAX_STREAMS
643643 #define MAX_STREAMS 20
644644 #endif
645645
@@ -662,7 +662,7 @@ typedef struct AVFormatContext { · 16 unmodified lines
662662 char filename[1024]; /**< input or output filename */
663663 /* stream info */
664664 int64_t timestamp;
665−#if LAVF_API_OLD_METADATA
665+#if FF_API_OLD_METADATA
666666 char title[512];
667667 char author[512];
668668 char copyright[512];
libavformat/metadata.c+1−1
@@ -86,7 +86,7 @@ int av_metadata_set2(AVMetadata **pm, const char *key, const char *value, int fl · 85 unmodified lines
8686 return 0;
8787 }
8888
89−#if LAVF_API_OLD_METADATA
89+#if FF_API_OLD_METADATA
9090 int av_metadata_set(AVMetadata **pm, const char *key, const char *value)
9191 {
9292 return av_metadata_set2(pm, key, value, 0);
libavformat/metadata.h+1−1
@@ -40,7 +40,7 @@ struct AVMetadataConv{ · 39 unmodified lines
4040 const char *generic;
4141 };
4242
43−#if LAVF_API_OLD_METADATA
43+#if FF_API_OLD_METADATA
4444 void ff_metadata_demux_compat(AVFormatContext *s);
4545 void ff_metadata_mux_compat(AVFormatContext *s);
4646 #endif
libavformat/metadata_compat.c+2−2
@@ -23,7 +23,7 @@ · 22 unmodified lines
2323 #include "metadata.h"
2424 #include "libavutil/avstring.h"
2525
26−#if LAVF_API_OLD_METADATA
26+#if FF_API_OLD_METADATA
2727
2828 #define SIZE_OFFSET(x) sizeof(((AVFormatContext*)0)->x),offsetof(AVFormatContext,x)
2929
@@ -145,4 +145,4 @@ void ff_metadata_mux_compat(AVFormatContext *ctx) · 115 unmodified lines
145145 }
146146 }
147147
148−#endif /* LAVF_API_OLD_METADATA */
148+#endif /* FF_API_OLD_METADATA */
libavformat/mpegts.c+1−1
@@ -686,7 +686,7 @@ static int mpegts_push_data(MpegTSFilter *filter, · 685 unmodified lines
686686 code == 0x1be) /* padding_stream */
687687 goto skip;
688688
689−#if LAVF_API_MAX_STREAMS
689+#if FF_API_MAX_STREAMS
690690 if (!pes->st && pes->stream->nb_streams == MAX_STREAMS)
691691 goto skip;
692692 #endif
libavformat/nutdec.c+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
2929 #undef NDEBUG
3030 #include <assert.h>
3131
32−#if LAVF_API_MAX_STREAMS
32+#if FF_API_MAX_STREAMS
3333 #define NUT_MAX_STREAMS MAX_STREAMS
3434 #else
3535 #define NUT_MAX_STREAMS 256 /* arbitrary sanity check value */
libavformat/options.c+1−1
@@ -50,7 +50,7 @@ static const AVOption options[]={ · 49 unmodified lines
5050 {"noparse", "disable AVParsers, this needs nofillin too", 0, FF_OPT_TYPE_CONST, AVFMT_FLAG_NOPARSE, INT_MIN, INT_MAX, D, "fflags"},
5151 {"igndts", "ignore dts", 0, FF_OPT_TYPE_CONST, AVFMT_FLAG_IGNDTS, INT_MIN, INT_MAX, D, "fflags"},
5252 {"rtphint", "add rtp hinting", 0, FF_OPT_TYPE_CONST, AVFMT_FLAG_RTP_HINT, INT_MIN, INT_MAX, E, "fflags"},
53−#if LAVF_API_OLD_METADATA
53+#if FF_API_OLD_METADATA
5454 {"track", " set the track number", OFFSET(track), FF_OPT_TYPE_INT, DEFAULT, 0, INT_MAX, E},
5555 {"year", "set the year", OFFSET(year), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, E},
5656 #endif
libavformat/utils.c+6−6
@@ -457,7 +457,7 @@ int av_open_input_stream(AVFormatContext **ic_ptr, · 456 unmodified lines
457457 if (pb && !ic->data_offset)
458458 ic->data_offset = url_ftell(ic->pb);
459459
460−#if LAVF_API_OLD_METADATA
460+#if FF_API_OLD_METADATA
461461 ff_metadata_demux_compat(ic);
462462 #endif
463463
@@ -2460,14 +2460,14 @@ void av_close_input_stream(AVFormatContext *s) · 1996 unmodified lines
24602460 av_free(st->index_entries);
24612461 av_free(st->codec->extradata);
24622462 av_free(st->codec);
2463−#if LAVF_API_OLD_METADATA
2463+#if FF_API_OLD_METADATA
24642464 av_free(st->filename);
24652465 #endif
24662466 av_free(st->priv_data);
24672467 av_free(st);
24682468 }
24692469 for(i=s->nb_programs-1; i>=0; i--) {
2470−#if LAVF_API_OLD_METADATA
2470+#if FF_API_OLD_METADATA
24712471 av_freep(&s->programs[i]->provider_name);
24722472 av_freep(&s->programs[i]->name);
24732473 #endif
@@ -2479,7 +2479,7 @@ void av_close_input_stream(AVFormatContext *s) · 5 unmodified lines
24792479 flush_packet_queue(s);
24802480 av_freep(&s->priv_data);
24812481 while(s->nb_chapters--) {
2482−#if LAVF_API_OLD_METADATA
2482+#if FF_API_OLD_METADATA
24832483 av_free(s->chapters[s->nb_chapters]->title);
24842484 #endif
24852485 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 · 96 unmodified lines
25822582 return NULL;
25832583 dynarray_add(&s->chapters, &s->nb_chapters, chapter);
25842584 }
2585−#if LAVF_API_OLD_METADATA
2585+#if FF_API_OLD_METADATA
25862586 av_free(chapter->title);
25872587 #endif
25882588 av_metadata_set2(&chapter->metadata, "title", title, 0);
@@ -2718,7 +2718,7 @@ int av_write_header(AVFormatContext *s) · 129 unmodified lines
27182718 return AVERROR(ENOMEM);
27192719 }
27202720
2721−#if LAVF_API_OLD_METADATA
2721+#if FF_API_OLD_METADATA
27222722 ff_metadata_mux_compat(s);
27232723 #endif
27242724

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t