From 610219a598095f938705f200dfe3946455ef871a Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 16 Feb 2011 08:52:35 +0000 Subject: [PATCH] lavf: add av_ prefix to dump_format() Signed-off-by: Mans Rullgard --- ffmpeg.c | 10 +++++----- ffplay.c | 2 +- ffprobe.c | 2 +- libavformat/avformat.h | 15 +++++++++++---- libavformat/movenchint.c | 2 +- libavformat/output-example.c | 2 +- libavformat/utils.c | 10 ++++++++++ libavformat/version.h | 3 +++ 8 files changed, 33 insertions(+), 13 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index 1cad57d80..185ca19a2 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1977,7 +1977,7 @@ static int transcode(AVFormatContext **output_files, for(i=0;inb_streams && !(os->oformat->flags & AVFMT_NOSTREAMS)) { - dump_format(output_files[i], i, output_files[i]->filename, 1); + av_dump_format(output_files[i], i, output_files[i]->filename, 1); fprintf(stderr, "Output file #%d does not contain any stream\n", i); ret = AVERROR(EINVAL); goto fail; @@ -2028,7 +2028,7 @@ static int transcode(AVFormatContext **output_files, /* Sanity check that the stream types match */ if (ist_table[ost->source_index]->st->codec->codec_type != ost->st->codec->codec_type) { int i= ost->file_index; - dump_format(output_files[i], i, output_files[i]->filename, 1); + av_dump_format(output_files[i], i, output_files[i]->filename, 1); fprintf(stderr, "Codec type mismatch for mapping #%d.%d -> #%d.%d\n", stream_maps[n].file_index, stream_maps[n].stream_index, ost->file_index, ost->index); @@ -2079,7 +2079,7 @@ static int transcode(AVFormatContext **output_files, } if (!found) { int i= ost->file_index; - dump_format(output_files[i], i, output_files[i]->filename, 1); + av_dump_format(output_files[i], i, output_files[i]->filename, 1); fprintf(stderr, "Could not find input stream matching output stream #%d.%d\n", ost->file_index, ost->index); ffmpeg_exit(1); @@ -2459,7 +2459,7 @@ static int transcode(AVFormatContext **output_files, /* dump the file output parameters - cannot be done before in case of stream copy */ for(i=0;ifilename, 1); + av_dump_format(output_files[i], i, output_files[i]->filename, 1); } /* dump the stream mapping */ @@ -3309,7 +3309,7 @@ static void opt_input_file(const char *filename) input_files_ts_offset[nb_input_files] = input_ts_offset - (copy_ts ? 0 : timestamp); /* dump the file content */ if (verbose >= 0) - dump_format(ic, nb_input_files, filename, 0); + av_dump_format(ic, nb_input_files, filename, 0); nb_input_files++; diff --git a/ffplay.c b/ffplay.c index b6343287a..e71c9c932 100644 --- a/ffplay.c +++ b/ffplay.c @@ -2464,7 +2464,7 @@ static int decode_thread(void *arg) st_index[AVMEDIA_TYPE_VIDEO]), NULL, 0); if (show_status) { - dump_format(ic, 0, is->filename, 0); + av_dump_format(ic, 0, is->filename, 0); } /* open the streams */ diff --git a/ffprobe.c b/ffprobe.c index 2c99e5a6b..94b1d9b2c 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -277,7 +277,7 @@ static int open_input_file(AVFormatContext **fmt_ctx_ptr, const char *filename) return err; } - dump_format(fmt_ctx, 0, filename, 0); + av_dump_format(fmt_ctx, 0, filename, 0); /* bind a decoder to each input stream */ for (i = 0; i < fmt_ctx->nb_streams; i++) { diff --git a/libavformat/avformat.h b/libavformat/avformat.h index afcf5b0d1..8752f07e0 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 5b07aa6d4..cdfb27613 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 06207eddf..edb5c8724 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 be4d6f78a..b325d0627 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 4e26eaaeb..922dd89f1 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 -- 2.11.0