diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-16 08:52:35 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-02-16 23:39:56 +0000 |
| commit | 610219a598095f938705f200dfe3946455ef871a (patch) | |
| tree | c7fd37b7ad37b19cc678ccdcd88aed202d26a152 /libavformat | |
| parent | 2c35a6bde95a382e2d48570255deb67a7633fa46 (diff) | |
| download | ffmpeg-610219a598095f938705f200dfe3946455ef871a.tar.gz | |
lavf: add av_ prefix to dump_format()
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 15 | ||||
| -rw-r--r-- | libavformat/movenchint.c | 2 | ||||
| -rw-r--r-- | libavformat/output-example.c | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 10 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
5 files changed, 26 insertions, 6 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index afcf5b0d11..8752f07e07 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1450,10 +1450,17 @@ int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, */ int av_write_trailer(AVFormatContext *s); -void dump_format(AVFormatContext *ic, - int index, - const char *url, - int is_output); +#if FF_API_DUMP_FORMAT +attribute_deprecated void dump_format(AVFormatContext *ic, + int index, + const char *url, + int is_output); +#endif + +void av_dump_format(AVFormatContext *ic, + int index, + const char *url, + int is_output); #if FF_API_PARSE_FRAME_PARAM /** diff --git a/libavformat/movenchint.c b/libavformat/movenchint.c index 5b07aa6d4b..cdfb276131 100644 --- a/libavformat/movenchint.c +++ b/libavformat/movenchint.c @@ -57,7 +57,7 @@ fail: av_log(s, AV_LOG_WARNING, "Unable to initialize hinting of stream %d\n", src_index); av_freep(&track->enc); - /* Set a default timescale, to avoid crashes in dump_format */ + /* Set a default timescale, to avoid crashes in av_dump_format */ track->timescale = 90000; return ret; } diff --git a/libavformat/output-example.c b/libavformat/output-example.c index 06207eddfc..edb5c87243 100644 --- a/libavformat/output-example.c +++ b/libavformat/output-example.c @@ -481,7 +481,7 @@ int main(int argc, char **argv) exit(1); } - dump_format(oc, 0, filename, 1); + av_dump_format(oc, 0, filename, 1); /* now that all the parameters are set, we can open the audio and video codecs and allocate the necessary encode buffers */ diff --git a/libavformat/utils.c b/libavformat/utils.c index be4d6f78af..b325d06276 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3261,11 +3261,21 @@ static void dump_stream_format(AVFormatContext *ic, int i, int index, int is_out dump_metadata(NULL, st->metadata, " "); } +#if FF_API_DUMP_FORMAT void dump_format(AVFormatContext *ic, int index, const char *url, int is_output) { + av_dump_format(ic, index, url, is_output); +} +#endif + +void av_dump_format(AVFormatContext *ic, + int index, + const char *url, + int is_output) +{ int i; uint8_t *printed = av_mallocz(ic->nb_streams); if (ic->nb_streams && !printed) diff --git a/libavformat/version.h b/libavformat/version.h index 4e26eaaebc..922dd89f1c 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -92,5 +92,8 @@ #ifndef FF_API_INDEX_BUILT #define FF_API_INDEX_BUILT (LIBAVFORMAT_VERSION_MAJOR < 53) #endif +#ifndef FF_API_DUMP_FORMAT +#define FF_API_DUMP_FORMAT (LIBAVFORMAT_VERSION_MAJOR < 54) +#endif #endif //AVFORMAT_VERSION_H |