Revision 0ebf4754

View differences:

ffmpeg.c
1993 1993
    for(i=0;i<nb_output_files;i++) {
1994 1994
        os = output_files[i];
1995 1995
        if (!os->nb_streams && !(os->oformat->flags & AVFMT_NOSTREAMS)) {
1996
            dump_format(output_files[i], i, output_files[i]->filename, 1);
1996
            av_dump_format(output_files[i], i, output_files[i]->filename, 1);
1997 1997
            fprintf(stderr, "Output file #%d does not contain any stream\n", i);
1998 1998
            ret = AVERROR(EINVAL);
1999 1999
            goto fail;
......
2044 2044
                /* Sanity check that the stream types match */
2045 2045
                if (ist_table[ost->source_index]->st->codec->codec_type != ost->st->codec->codec_type) {
2046 2046
                    int i= ost->file_index;
2047
                    dump_format(output_files[i], i, output_files[i]->filename, 1);
2047
                    av_dump_format(output_files[i], i, output_files[i]->filename, 1);
2048 2048
                    fprintf(stderr, "Codec type mismatch for mapping #%d.%d -> #%d.%d\n",
2049 2049
                        stream_maps[n].file_index, stream_maps[n].stream_index,
2050 2050
                        ost->file_index, ost->index);
......
2095 2095
                    }
2096 2096
                    if (!found) {
2097 2097
                        int i= ost->file_index;
2098
                        dump_format(output_files[i], i, output_files[i]->filename, 1);
2098
                        av_dump_format(output_files[i], i, output_files[i]->filename, 1);
2099 2099
                        fprintf(stderr, "Could not find input stream matching output stream #%d.%d\n",
2100 2100
                                ost->file_index, ost->index);
2101 2101
                        ffmpeg_exit(1);
......
2474 2474
    /* dump the file output parameters - cannot be done before in case
2475 2475
       of stream copy */
2476 2476
    for(i=0;i<nb_output_files;i++) {
2477
        dump_format(output_files[i], i, output_files[i]->filename, 1);
2477
        av_dump_format(output_files[i], i, output_files[i]->filename, 1);
2478 2478
    }
2479 2479

  
2480 2480
    /* dump the stream mapping */
......
3324 3324
    input_files_ts_offset[nb_input_files] = input_ts_offset - (copy_ts ? 0 : timestamp);
3325 3325
    /* dump the file content */
3326 3326
    if (verbose >= 0)
3327
        dump_format(ic, nb_input_files, filename, 0);
3327
        av_dump_format(ic, nb_input_files, filename, 0);
3328 3328

  
3329 3329
    nb_input_files++;
3330 3330

  
ffplay.c
2468 2468
                                 st_index[AVMEDIA_TYPE_VIDEO]),
2469 2469
                                NULL, 0);
2470 2470
    if (show_status) {
2471
        dump_format(ic, 0, is->filename, 0);
2471
        av_dump_format(ic, 0, is->filename, 0);
2472 2472
    }
2473 2473

  
2474 2474
    /* open the streams */
ffprobe.c
277 277
        return err;
278 278
    }
279 279

  
280
    dump_format(fmt_ctx, 0, filename, 0);
280
    av_dump_format(fmt_ctx, 0, filename, 0);
281 281

  
282 282
    /* bind a decoder to each input stream */
283 283
    for (i = 0; i < fmt_ctx->nb_streams; i++) {
libavformat/avformat.h
1450 1450
 */
1451 1451
int av_write_trailer(AVFormatContext *s);
1452 1452

  
1453
void dump_format(AVFormatContext *ic,
1454
                 int index,
1455
                 const char *url,
1456
                 int is_output);
1453
#if FF_API_DUMP_FORMAT
1454
attribute_deprecated void dump_format(AVFormatContext *ic,
1455
                                      int index,
1456
                                      const char *url,
1457
                                      int is_output);
1458
#endif
1459

  
1460
void av_dump_format(AVFormatContext *ic,
1461
                    int index,
1462
                    const char *url,
1463
                    int is_output);
1457 1464

  
1458 1465
#if FF_API_PARSE_FRAME_PARAM
1459 1466
/**
libavformat/movenchint.c
57 57
    av_log(s, AV_LOG_WARNING,
58 58
           "Unable to initialize hinting of stream %d\n", src_index);
59 59
    av_freep(&track->enc);
60
    /* Set a default timescale, to avoid crashes in dump_format */
60
    /* Set a default timescale, to avoid crashes in av_dump_format */
61 61
    track->timescale = 90000;
62 62
    return ret;
63 63
}
libavformat/output-example.c
481 481
        exit(1);
482 482
    }
483 483

  
484
    dump_format(oc, 0, filename, 1);
484
    av_dump_format(oc, 0, filename, 1);
485 485

  
486 486
    /* now that all the parameters are set, we can open the audio and
487 487
       video codecs and allocate the necessary encode buffers */
libavformat/utils.c
3261 3261
    dump_metadata(NULL, st->metadata, "    ");
3262 3262
}
3263 3263

  
3264
#if FF_API_DUMP_FORMAT
3264 3265
void dump_format(AVFormatContext *ic,
3265 3266
                 int index,
3266 3267
                 const char *url,
3267 3268
                 int is_output)
3268 3269
{
3270
    av_dump_format(ic, index, url, is_output);
3271
}
3272
#endif
3273

  
3274
void av_dump_format(AVFormatContext *ic,
3275
                    int index,
3276
                    const char *url,
3277
                    int is_output)
3278
{
3269 3279
    int i;
3270 3280
    uint8_t *printed = av_mallocz(ic->nb_streams);
3271 3281
    if (ic->nb_streams && !printed)
libavformat/version.h
92 92
#ifndef FF_API_INDEX_BUILT
93 93
#define FF_API_INDEX_BUILT             (LIBAVFORMAT_VERSION_MAJOR < 53)
94 94
#endif
95
#ifndef FF_API_DUMP_FORMAT
96
#define FF_API_DUMP_FORMAT             (LIBAVFORMAT_VERSION_MAJOR < 54)
97
#endif
95 98

  
96 99
#endif //AVFORMAT_VERSION_H

Also available in: Unified diff