Revision 0ebf4754 ffmpeg.c

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

  

Also available in: Unified diff